From e5e9f6542475186a86ffae64f8e7f52f1f8186f3 Mon Sep 17 00:00:00 2001
From: "Shankar.KV" <shankar.vaithiyanadhaswamy@exasol.com>
Date: Thu, 27 Aug 2026 18:54:54 +0530
Subject: [PATCH 1/8] removed Java documentation

---
 exaudfclient/README.md                        |   9 +-
 .../java_script_options_parser.drawio.png     | Bin 88339 -> 0 bytes
 exaudfclient/docs/script_options_design.md    | 483 ------------------
 .../docs/script_options_requirments.md        | 401 ---------------
 4 files changed, 3 insertions(+), 890 deletions(-)
 delete mode 100644 exaudfclient/docs/java_script_options_parser.drawio.png
 delete mode 100644 exaudfclient/docs/script_options_design.md
 delete mode 100644 exaudfclient/docs/script_options_requirments.md

diff --git a/exaudfclient/README.md b/exaudfclient/README.md
index 1f8bd30..b2e03c2 100644
--- a/exaudfclient/README.md
+++ b/exaudfclient/README.md
@@ -1,6 +1,6 @@
 # What is the exaudfclient?
 
-The exaudfclient connects to the database via [ZeroMQ](http://zeromq.org/) and fetches the tuples which then get processed by the user-defined functions (UDFs). Currently, the exaudfclient supports UDFs in the language Python, Java and R. Further languages can be integrated via language binding between C/C++ and the desired langauge. Python 3, Java and R use [SWIG](http://www.swig.org/) for the language binding.
+The exaudfclient connects to the database via [ZeroMQ](http://zeromq.org/) and fetches the tuples which then get processed by the user-defined functions (UDFs). Currently, the exaudfclient supports UDFs in Python and R. Further languages can be integrated via language binding between C/C++ and the desired language. Python 3 and R use [SWIG](http://www.swig.org/) for the language binding.
 
 # How to build the exaudfclient?
 
@@ -8,7 +8,6 @@ The exaudfclient connects to the database via [ZeroMQ](http://zeromq.org/) and f
 
 For the build system:
 
-- Open JDK 11
 - bazel-7.2.1 for more details see [Bazel documentation](https://docs.bazel.build/versions/master/install.html)
 
 The exaudfclient was tested with the following versions of its dependencies:
@@ -23,12 +22,11 @@ For the language support:
 
 - Python 3.10 for pythoncontainer
     - for Python 3 the build requires [Numpy](https://www.numpy.org/) and [Pandas](https://pandas.pydata.org/) in addition for the Pandas Dataframe Support
-- OpenJDK 11 for javacontainer
 - R 4.4 for the rcontainer
 
 ## Start a build
 
-The exaudfclient is a multi-language project. Therefore, we are using [Bazel](https://docs.bazel.build/versions/master/bazel-overview.html) as build system, because it provides build support for many languages and allows to mix these languages. Because the exaudfclient has language bindings to Python 2/3, Java and R, we need specify where Bazel can find the correponding library- and header-files. This is done by Environment Variables.
+The exaudfclient is a multi-language project. Therefore, we are using [Bazel](https://docs.bazel.build/versions/master/bazel-overview.html) as build system, because it provides build support for many languages and allows to mix these languages. Because the exaudfclient has language bindings to Python 2/3 and R, we need specify where Bazel can find the corresponding library and header files. This is done by environment variables.
 
 For executing the build locally, you can use the script 
 
@@ -46,7 +44,6 @@ Both build script can receive parameters, such as Bazel commandline parameter, B
 
 With Bazel defines you can specify which language support is actually compiled into you exaudfclient executbale. The currently supported defines are
 
-    --define java=true
     --define r=true
     --define python=true
     --define benchmark=true # This language is only for test and development purpose and benchmarks the performance of the C++ Implementation
@@ -70,7 +67,7 @@ The usage of multiple linker namespace requires some precautions in the build pr
 
 ## Precautions in the build process
 
-In the build process you need to be cautious which libraries you link together and that no link leaks symbols from a library in one namespace to a library in the other namespace. Furthermore, you have to build a shared library with all dependency linked to it as output target. In our case, we have to main output targets //:exaudfclient and //:libexaudflib.so. Both get loaded into different linker namespaces. The language container live in the same namespace as //:exaudfclient. This namespace must not know anyhing about protobuf and zeromq, because it is possible that a language container may load protobuf or zeromq in a different version. Protobuf and zeromq are only known in the namespace of //:libexaudflib.so. The target //:libexaudflib.so depends on //base/exaudflib:exaudflib which contains the logic of the exaudflib. You must not depend on //base/exaudflib:exaudflib in //:exaudfclient or the langauge container, because this would leak zeromq and protobuf. If you need to depend on the other dependency of //base/exaudflib:exaudflib which not depend on protobuf or zeromq them self, such as //base/exaudflib:script_data_transfer_objects, //base/exaudflib:script_data_transfer_objects_wrapper, //base/script_options_parser:scriptoptionlines, use either their target as self, the collection of libraries //base/exaudflib:exaudflib-deps or the collection of headers //base/exaudflib:header.
+In the build process you need to be cautious which libraries you link together and that no link leaks symbols from a library in one namespace to a library in the other namespace. Furthermore, you have to build a shared library with all dependency linked to it as output target. In our case, we have two main output targets: //:exaudfclient and //:libexaudflib.so. Both get loaded into different linker namespaces. The language containers live in the same namespace as //:exaudfclient. This namespace must not know anything about protobuf and zeromq, because a language container may load protobuf or zeromq in a different version. Protobuf and zeromq are only known in the namespace of //:libexaudflib.so. The target //:libexaudflib.so depends on //base/exaudflib:exaudflib which contains the logic of the exaudflib. You must not depend on //base/exaudflib:exaudflib in //:exaudfclient or a language container, because this would leak zeromq and protobuf. If you need other dependencies of //base/exaudflib:exaudflib that do not depend on protobuf or zeromq, such as //base/exaudflib:script_data_transfer_objects or //base/exaudflib:script_data_transfer_objects_wrapper, use their target directly, the collection of libraries //base/exaudflib:exaudflib-deps, or the collection of headers //base/exaudflib:header.
 
 ## Precautions in the implementations
 
diff --git a/exaudfclient/docs/java_script_options_parser.drawio.png b/exaudfclient/docs/java_script_options_parser.drawio.png
deleted file mode 100644
index c51fac44e96eae1efddc33693be4fb083f3c007c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 88339
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
V$RYK<iVXaRQM;u2UfJyae*@E98YBP!

diff --git a/exaudfclient/docs/script_options_design.md b/exaudfclient/docs/script_options_design.md
deleted file mode 100644
index 7e43136..0000000
--- a/exaudfclient/docs/script_options_design.md
+++ /dev/null
@@ -1,483 +0,0 @@
-# Design Document
-
-This document details the design aspects of the new Exasol UDF Client Script Options parser, based on the high-level requirements outlined in the System Requirement Specification.
-
-## Acknowledgments
-
-This document's section structure is derived from the "[arc42](https://arc42.org/)" architectural template by Dr. Gernot Starke, Dr. Peter Hruschka.
-
-## Constraints
-
-- The parser implementation must be in C++.
-- The selected parser should allow easy encapsulation in a custom C++ namespace (UDF client linker namespace constraint)
-- The selected parser should not depend on additional runtime dependencies
-- The selected parser should have minimal compile time dependencies, i.e. no additional shared libraries or tools to generate C++ code
-
-### Requirement Overview
-
-Please refer to the [System Requirement Specification](script_options_requirments.md) for user-level requirements.
-
-## Building Blocks
-
-### Overall Architecture
-
-#### Component Overview
-
-![Components](diagrams/OveralScriptOptionalsBuildingBlocks.drawio.png)
-
-At the very high level there can be distinguished between the generic "Script Options Parser" module which parses a UDF script code and returns the found script options, and the "Script Options Parser Handler" which converts the Java UDF specific script options. In both modules there are specific implementation for the legacy parser and the new CTPG based parser. We need to keep the legacy implementation alive, as the new approach causes some breaking changes, especially related to the new escape patterns: Existing UDF might not be working with the new parser implementation. 
-
-### Script Options Parser
-
-The parser component can be used to parse any script code (Java, Python, R) for any script options. It provides simplistic interfaces, which are different between the two versions, which accept the script code as input and return the found script option(s). The interfaces need to be different because both parsers work inherently differently: While the legacy parser successively finds and removes script options by the given key, the new parser finds **all** script options at once, but does not remove them. 
-
-#### Legacy Parser
-
-The legacy parser (V1) parser searches for one specific script option, removes the whole option from the script code, and returns the script option value. 
-
-#### V2 Parser
-
-The new parser uses the [CTPG libary](https://github.com/peter-winter/ctpg) which fulfills the technical constraints: It comes as a single C++ header file and does not require any runtime dependencies. The grammar and lexical rules can be defined in pure C++ and the parser is constructed during compile time, thus not having any performance overhead at runtime. 
-It is important to use a parser generator implementation which allows the definition of grammar and lexical rules, in order to achieve the new requirements regarding recognizing escape sequences in the script option values. Also, the clear definition of those rules makes the implementation better understandable. 
-
-As the parser needs to find script options in any given script code, the generated parser must accept any strings which are not script options and ignore those. In order to achieve this, the lexer rules need to be as simple as possible, in order to avoid collisions.
-
-It is important to emphasize that in contrast to the legacy parser, the caller is responsible for removing the script options from the script code, as the parser is agnostic to the actual script options keys.
-The interface provides a method which accepts the script code as input and returns a map with all found script options in the whole code. Each key in the map points to a list of all option values plus the start and end position of the option for this specific option key.
-
-### Parser Handler
-
-The parser handler uses the Script Options parser to query for specific options which are part of [Exasol's Java UDF specification](https://docs.exasol.com/db/latest/database_concepts/udf_scripts/java.htm):
-1. JVM Options
-2. JAR Options
-3. Import Script Options
-4. ScriptClass Option
-
-Because the new parser implementation parses all script options at once, and because some of the system requirements differ between both version, the Parser Handler implementations are also very different between the legacy and the ctpg based one. However, both implementations provide the same interface to the Java VM in the UDF Framework:
-
-![Exctractor](diagrams/ScriptOptionsExtractorInterface.drawio.png)
-
-Note that variable `script_code` is passed per reference. This is because the Parser Handler might modify the script code:
-1. Remove the script options
-2. Replace any found `import` script option with the respective scripts.
-
-The following sequence diagram shows how the Java VM implementation uses the Parser Handler to extract the script options.
-
-![ExctractSequenceDiagram](diagrams/ScriptOptionsParserHandlerSequence.drawio.png)
-
-#### Legacy Parser Handler
-
-![LegacyParserHandler](diagrams/LegacyParserHandler.drawio.png)
-
-The `ScriptOptionsLinesParserLegacy` class uses the Parser to search for Java specific script options and forwards the found options to the class `ConverterLegacy`, which uses a common implementation for the conversion of the options.
-Class `tLegacyExtractor` connects `ScriptOptionsLinesParserLegacy` to `ConverterLegacy` and then orchestrates the parsing sequence. 
-
-`ScriptOptionsLinesParserLegacy` also implements the import of foreign scripts. The import script algorithm iteratively replaces foreign scripts. The algorithm is described in the following pseudocode snippet:
-```
-while True:
- next_import_option, position = ScriptOptionsLegacyParser.parse(script_code, "%import")
- if next_import_option_value != "":
-   foreign_script_code = resolve_foreign_script_somehow(next_import_option.value)
-   if not md5_hashset.has(foreign_script_code):
-      md5_hashset.add(foreign_script_code)
-      script_code.replaceAt(position, lenght(next_import_option), foreign_script_code) 
- else if not found:
-   break
-```
-
-#### CTPG based Parser Handler
-
-![CTPGParserHandler](diagrams/CTPGParserHandler.drawio.png)
-
-The `ScriptOptionsLinesParserCTPG` class uses the new CTPG based Parser to search for **all** Java specific script options at once. Then it forwards the found options to class `ConverterV2`, which uses a common implementation for the conversion of the options. `ConverterV2` also implements the functions to convert Jvm otions and JAR options.   
-Class `tExtractorV2` connects `ScriptOptionsLinesParserCTPG` to `ConverterV2` and then orchestrates the parsing sequence.
-
-##### CTPG based Script Import Algorithm
-`ScriptOptionsLinesParserCTPG` uses an instance of `ScriptImporter` to import foreign scripts. Because the new parser collects all script options at once, but backwards compatibility with existing UDF scripts must be ensured, there is an additional level of complexity in the import script algorithm. The algorithm is described in the following pseudocode snippet:
-```
-function import(script_code, options_map)
- import_options = options_map.find("import")
- if found:
-    sorted_import_options = sort(import_options) //import options according to their location in the script, increasing order
-    collectedScripts = list() //list of (script_code, location, size)
-    for each import_option in sorted_import_options:
-       import_script_code = resolve_foreign_script_somehow(import_option.value)
-       if not md5_hashset.has(import_script_code):
-          md5_hashset.add(import_script_code)
-          new_options_map = ScriptOptionsCTPGParser.parse(import_script_code)
-          new_script_code = ""
-          import(new_script_code, new_options_map)
-          collectedScripts.add(new_script_code, import_option.position, import_option.length_of_script_option) 
-    for foreign_script in reverse(collectedScripts):
-       script_code.replaceAt(foreign_script.position, foreign_script.length_of_script_option, foreign_script.foreign_script) 
-```
-
-The scripts need to be replaced in reverse order because otherwise the locations of import options later in the script would get invalidated by the replacement.
-
-The following example demonstrates the flow of the algorithm:
-
-_Main UDF_:
-```
-%import other_script_A;
-%import other_script_C;
-class JVMOPTION_TEST {
-    static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-        ctx.emit(\"Success!\");
-    }
-}
-```
-
-_other_script_A_:
-```
-%import other_script_B;
-class OtherClassA {
-    static void doSomething() {}
-}
-```
-
-_other_script_B_:
-```
-class OtherClassB {
-    static void doSomething() {}
-}
-```
-
-_other_script_C_:
-```
-%import other_script_A
-class OtherClassC {
-    static void doSomething() {}
-}
-```
-
-The result must be:
-```
-class OtherClassB {
-    static void doSomething() {}
-}
-class OtherClassA {
-    static void doSomething() {}
-}
-class OtherClassC {
-    static void doSomething() {}
-}
-class JVMOPTION_TEST {
-    static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-        ctx.emit(\"Success!\");
-    }
-}
-```
-
-The following diagram shows how the scripts are collected in the recursive algorithm:
-
-![V2ImportScriptFlow](diagrams/V2ImportScriptFlow.drawio.png)
-
-
-
-## Runtime
-
-### Parser Implementation V1
-
-The legacy parser (V1) parser searches for one specific script option. The parser starts from the beginning of the script code. If found, the parser immediately removes the script option from the script code and returns the option value. 
-
-### Parser Implementation V2
-
-The parser provides an interface to parse the UDF script for all options at once. All found script options need to be collected in an associative container. Internally, the parses uses [ctpg](https://github.com/peter-winter/ctpg) to parse the UDF script code line-by-line.
-
-## Cross-cutting Concerns
-
-
-## Design Decisions for V2
-
-### Parser Implementation
-`dsn~parser-implementation~1`
-
-Implement the parser using [ctpg](https://github.com/peter-winter/ctpg), an open-source parser library. This library will be used to define Lexer and Parser Rules in C++ code, ensuring no additional runtime dependencies exist.
-
-
-Covers:
-- `req~general-script-options-parsing~1`
-- `req~existing-parser-library-license~1`
-
-Tags: V2
-
-
-### Lexer and Parser Rules Option
-`dsn~lexer-parser-rules~1`
-
-Lexer and Parser rules to recognize `%optionKey`, `optionValue`, with whitespace characters as separator. The Parser rules will define the grammar to correctly identify Script Options, manage multiple options with the same key, and handle duplicates.
-The regular expression for the lexer term for finding newline escape sequences or the semicolon escape sequence is `\\;|\\n|\\r|\\\\`. The regular expression for the lexer term for finding white space escape sequences is `\\ |\\t|\\f|\\v`. 
-
-Covers:
-- `req~general-script-options-parsing~1`
-- `req~white-spaces~1`
-- `req~leading-white-spaces-script-options-parsing~1`
-
-Depends:
-- `dsn~parser-implementation~1`
-
-Tags: V2
-
-### Lexer and Parser Rules Not an option
-`dsn~lexer-parser-rules-not-an-option~1`
-
-Lexer and Parser rules to recognize anything what is not an option.
-
-
-Covers:
-- `req~ignore-none-script-options~1`
-
-Depends:
-- `dsn~parser-implementation~1`
-
-Tags: V2
-
-### Run Parser line-by-line
-`dsn~run-parser-line-by-line~1`
-
-The parser must be executed line-by-line, because script options can be placed at any location in the UDF. Every found map of options must be added to the resulting map.
-
-
-Covers:
-- `req~multiple-lines-script-options-parsing~1`
-
-Depends:
-- `dsn~parser-implementation~1`
-
-Tags: V2
-
-### Ignore lines without script options
-`dsn~ignore-lines-without-script-options~1`
-
-In order to avoid lower performance compared to the old implementation, the parser must run only on lines which contain a `%` character after only whitespaces.
-
-
-Covers:
-- `req~multiple-lines-script-options-parsing~1`
-
-Depends:
-- `dsn~parser-implementation~1`
-
-Tags: V2
-
-
-### Handling Multiple and Duplicate Options
-`dsn~handling-multiple-duplicate-options~1`
-
-Create a mechanism within the parser to collect and aggregate multiple Script Options with the same key.
-The parser must return an associative container of the format:
-```
-{
-<option key A> => list(<option_value A.1>, <option_value A.2>,..., <option_value A.n>),
-<option key B> => list(<option_value B.1>, <option_value B.2>,..., <option_value B.m>)
-}
-```   
-
-
-
-Covers:
-- `req~multiple-options-management~1`
-- `req~duplicate-options-management~1`
-
-Tags: V2
-
-### Lexer and Parser Rules Whitespace Sequences
-`dsn~lexer-parser-rules-whitespace-sequences~1`
-
-Define the Lexer rules to tokenize whitespace sequences, and parser rules to recognize those white space characters as option separator.
-For white space character within an option value, those must be added as is to the result option value.
-For white space character in anything else, what is not an option, those white space characters must be ignored.
-
-
-
-Covers:
-- `req~white-spaces-script-options-parsing-v2~1`
-Depends:
-- `dsn~parser-implementation~1`
-
-Tags: V2
-
-### Lexer and Parser Rules Whitespace Escape Sequences
-`dsn~lexer-parser-rules-whitespace-escape-sequences~1`
-
-Define the Lexer rules to tokenize whitespace escape sequences:
-- '\ ' => space character
-- '\t' => <tab> character
-- '\f' => <form feed> character
-- '\v' => <vertical tab> character
-
-Implement rules which replace those white space escape tokens only at the beginning of an option value. Add parser rules to leave those tokens as is in anything else, which is not a script option. Those token are not expected to be part of an option key.
-
-
-Covers:
-- `req~leading-white-spaces-script-options-parsing~1`
-Depends:
-- `dsn~parser-implementation~1`
-
-Tags: V2
-
-### Lexer and Parser Rules Escape Sequences
-`dsn~lexer-parser-rules-escape-sequences~1`
-
-Define the Lexer rules to tokenize '\n', '\r', '\;' sequences, and parser rules to replace those sequences with <line feed>, <carriage return> or ';' characters. 
-Implement rules which replace those token at any location in an option value. Add parser rules to leave those tokens as is in anything else, which is not a script option. Those token are not expected to be part of an option key.
-
-
-Covers:
-- `req~escape-sequence-script-options-parsing~1`
-Depends:
-- `dsn~parser-implementation~1`
-
-Tags: V2
-
-### Script Option Removal Mechanism
-`dsn~script-option-removal~1`
-
-Implement a method in class `ScriptOptionLinesParserCTPG` which removes *all* identified Script Options from the original script code at once. This method should be executed after the import scripts are replaced. The algorithm must replace the script options in reverse order in order to maintain consistency of internal list of positions.
-
-
-Covers:
-- `req~script-option-removal~1`
-- `req~java-scriptclass-option-handling-v2~1`
-
-Tags: V2
-
-### Unknown Options Check
-`dsn~script-option-unknown-options-behvaior-v2~1`
-
-Implement a check in class `ScriptOptionLinesParserCTPG` which verifies that only known script options are found. Otherwise, raise an exception with information about the position and name of the unknown option.
-
-Covers:
-- `req~script-option-unknown-options-behavior-v2~1`
-
-Tags: V2
-
-### Java %scriptclass Option Handling
-`dsn~java-scriptclass-option-handling~1`
-
-Implement a function in the `ConverterV2` class which adds the script class option to the JVM Options list.
-
-
-Covers:
-- `req~java-scriptclass-option-handling-v2~1`
-
-Tags: V2
-
-### Java %jar Option Collection
-`dsn~java-jar-option-collection~1`
-
-Implement an algorithm in class `ConverterV2` which parses the given Jar option value in the expected format `<file1>:<file2>:...:<filen>`. The algorithm shall split by colon (':') and then collect the found Jar options in a list. 
-Compare [OpenJdk implementation](https://github.com/AdoptOpenJDK/openjdk-jdk11/blob/19fb8f93c59dfd791f62d41f332db9e306bc1422/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java#L174) of parsing the classpath.
-
-Covers:
-- `req~java-jar-option-handling-v2~1`
-- `req~java-jar-option-handling-multiple-options~1`
-
-Tags: V2
-
-### Java %jar Option Whitespace Handling
-`dsn~java-jar-option-whitespace-handling~1`
-
-Implement an algorithm in class `ScriptOptionLinesParserCTPG` which replaces trailing white space escape sequences in a Jar option value with the respective white space character. 
-
-
-Covers:
-- `req~java-jar-option-trailing-white-space-handling~1`
-
-Tags: V2
-
-
-### Java %jvmoption Handling
-`dsn~java-jvmoption-handling~1`
-
-Implement an algorithm in class `ConverterV2` which uses the `CTPG` library to parse and split a Jvm option value by white space characters.
-
-
-Covers:
-- `req~java-jvmoption-handling~1`
-- `req~java-jvmoption-whitespace-handling~1`
-
-Tags: V2
-
-### Java %jvmoption Whitespace Handling
-`dsn~java-jvmoption-whitespace-handling~1`
-
-Define the Lexer rules to tokenize whitespace sequences.
-Implement rules which split JVM options by those token.
-
-
-Depends:
-- `dsn~java-jvmoption-handling~1`
-
-Covers:
-- `req~java-jvmoption-whitespace-handling~1`
-
-Tags: V2
-
-### Java %jvmoption Whitespace Escape Handling
-`dsn~java-jvmoption-whitespace-esacape-handling~1`
-
-Define the Lexer rules to tokenize whitespace escape sequences:
-- '\ ' => space character
-- '\t' => <tab> character
-- '\f' => <form feed> character
-- '\v' => <vertical tab> character
-
-Implement rules which replace those white space escape tokens which are part of a Jvm option.
-
-Depends:
-- `dsn~java-jvmoption-handling~1`
-
-Covers:
-- `req~java-jvmoption-whitespace-escape-handling-v2~1`
-
-Tags: V2
-
-### Java %import Option Replacement
-`dsn~java-import-option-replacement~1`
-
-Implement logic to process %import options by interacting with the Swig Metadata object.
-The algorithm should work according to  [section CTPG based Script Import Algorithm](#CTPG-based-Script-Import-Algorithm). 
-
-
-Covers:
-- `req~java-import-option-replace-referenced-scripts~1`
-- `req~java-import-option-referenced-scripts-name~1`
-
-Tags: V2
-
-### Java %import Option resolve foreign Script Options
-`dsn~java-import-option-resolve-foreign-script-options~1`
-
-After all `%import` script options are replaced in the script code, the parser must re-run in order to also detect script options which are part of the imported scripts. 
-
-Covers:
-- `req~java-import-option-handling-v2~1`
-
-
-Tags: V2
-
-### General Parser Integration
-`dsn~general-parser-integration~1`
-
-Ensure that the new parser integrates seamlessly into the Exasol UDF Client environment and the Exasol DB. This includes embedding the parser within the custom C++ namespace, ensuring it meets all linker requirements, and does not introduce additional runtime dependencies.
-
-
-Covers:
-- `req~general-script-options-parsing~1`
-
-Tags: V2
-
-## Quality Scenarios
-
-## Risks
-
-### Overall
-
-#### Efficient Parser implementation
-
-The performance must not be slower than the old implementation.
-
-##### Mitigation
-
-Design decision `dsn~ignore-lines-without-script-options~1` tries to mitigate this risk.
diff --git a/exaudfclient/docs/script_options_requirments.md b/exaudfclient/docs/script_options_requirments.md
deleted file mode 100644
index aeec958..0000000
--- a/exaudfclient/docs/script_options_requirments.md
+++ /dev/null
@@ -1,401 +0,0 @@
-# System Requirement Specification
-
-This document outlines the user-centric requirements for the new Exasol UDF Client Script Options parser. It identifies the key features, high-level requirements, and user roles to ensure clarity and alignment with user needs.
-
-## Roles
-
-This section lists the roles that will interact with or benefit from the parser system.
-
-### Database Administrator
-Database Administrators manage the database environment and ensure the efficient execution of UDFs within Exasol, configuring and overseeing script execution.
-
-### Data Scientist
-Data Scientists develop and deploy UDFs in languages such as Java, Python, or R to process and analyze data within Exasol.
-
-### Developer
-Developers who integrates the Script Options parser library into other software.
-
-## Features
-
-This section lists the key features of the new UDF Client Script Options parser which you would highlight in a product leaflet.
-
-### General Script Options Parsing
-`feat~general-script-options-parsing~1`
-
-Script Options must be parsed according to a given syntax definition.
-Developers can add additional Options in an easy and consistent way.
-
-Needs: req
-
-### Java-specific Script Options
-`feat~java-specific-script-options~1`
-
-The parser must process all Java-specific options correctly.
-
-Needs: req
-
-## High-level Requirements
-
-This section details the high-level requirements for the new parser system, linked to the features listed above.
-
-### General Script Options Parsing
-`req~general-script-options-parsing~1`
-
-The parser must correctly identify and handle Script Options with the syntax `%<optionKey><white spaces><optionValue>;`.
-
-Needs: dsn
-
-Covers:
-- `feat~general-script-options-parsing~1`
-
-### White Spaces
-`req~white-spaces~1`
-
-The parser must treat the following list of white spaces as token separator:
-
- 
-| Name         | C syntax      | ASCII Dec | ASCII Hex     | 
-|--------------|---------------|-----------|---------------|
-| tabulator    | '\t'          | 9         | 0x09          |
-| vertical tab | '\v'          | 11        | 0x0b          |
-| form feed    | '\f'          | 12        | 0x0c          |
-| space        | ' '           | 30        | 0x20          |     
-
-Needs: dsn
-
-Covers:
-- `feat~general-script-options-parsing~1`
-
-
-### Leading White Spaces Options Parsing
-`req~leading-white-spaces-script-options-parsing~1`
-
-The parser must accept Script Options for lines starting with any number of white space characters before the Script Options.
-
-Needs: dsn
-
-Covers:
-- `feat~general-script-options-parsing~1`
-
-Depends:
- - `req~white-spaces~1`
-
-### Ignore anything which is not a Script Option
-`req~ignore-none-script-options~1`
-
-If there is any character in front of a Script Option which is not a white space, the parser must ignore the option(s). 
-
-Needs: dsn
-
-Covers:
-- `feat~general-script-options-parsing~1`
-
-Depends:
- - `req~white-spaces~1`
-
-### Multiple Line Script Options Parsing
-`req~multiple-lines-script-options-parsing~1`
-
-The parser must recognize Script Options at any line in the given script code. 
-
-Rationale: This is especially important because the `%import` option (see requirement `req~java-import-option-replace-referenced-scripts~1`) might replace options with Java code in the final script code.
-
-Needs: dsn
-
-Covers:
-- `feat~general-script-options-parsing~1`
-
-### White Spaces Options Parsing V1
-`req~white-spaces-script-options-parsing-v1~1`
-
-All white spaces between the option key and option value are to be interpreted as separator. 
-White spaces between the option value and the terminating ";" are to be removed from the option value.
-
-Needs: dsn
-
-Tags: V1
-
-Covers:
-- `feat~general-script-options-parsing~1`
-
-Depends:
- - `req~white-spaces~1`
-
-### White Spaces Options Parsing V2
-`req~white-spaces-script-options-parsing-v2~1`
-
-All white spaces between the option key and option value are to be ignored. The following rules for escape sequences at **the start** of a script option value are to be applied:
-- '\ ' => space character
-- '\t' => <tab> character
-- '\f' => <form feed> character
-- '\v' => <vertical tab> character
-
-White spaces in the middle of the option value and between the option value and the terminating ";" shall be interpreted as part of the value.
-
-Rationale: The new version of the parser should be as much as possible backwards compatible to V1, because it will simplify migration of existing UDF's.
-
-Needs: dsn
-
-Tags: V2
-
-Covers:
-- `feat~general-script-options-parsing~1`
-
-Depends:
- - `req~white-spaces~1`
-
-### Multiple Options
-`req~multiple-options-management~1`
-
-The parser must collect multiple Script Options with the same key.
-
-Comment: 
-"Collecting" in this context means that a merging strategy must be applied. We don't want multiple options with the same key to result in simply overwriting or discarding values. Please note that the specific handling depends on the individual option handler.
-
-Needs: dsn
-
-Covers:
-- `feat~general-script-options-parsing~1`
-
-### Duplicate Options Management
-`req~duplicate-options-management~1`
-
-The parser must collect multiple Script Options with the same key and same/different value. Note: the specific handling depends on the option handler.
-
-Needs: dsn
-
-Covers:
-- `feat~general-script-options-parsing~1`
-
-### Script Option Removal
-`req~script-option-removal~1`
-
-The parser handler must remove found known Script Options from the original script code. 
-
-Needs: dsn
-
-Covers:
-- `feat~general-script-options-parsing~1`
-- `feat~java-specific-script-options~1`
-
-### Script Option Unknown Options Behavior V1
-`req~script-option-unknown-options-behvaior-v1~1`
-
-Unknown script options must remain untouched in the script code. The Java compiler is supposed to throw an error message during the compilation. 
-
-Needs: dsn
-
-Covers:
-- `feat~general-script-options-parsing~1`
-- `feat~java-specific-script-options~1`
-
-Tags: V1
-
-### Script Option Unknown Options Behavior V2
-`req~script-option-unknown-options-behavior-v2~1`
-
-The parser handler must detect unknown script options and throw an exception if such an options is found. 
-
-Needs: dsn
-
-Covers:
-- `feat~general-script-options-parsing~1`
-- `feat~java-specific-script-options~1`
-
-Tags: V2
-
-### Escape Sequence Script Options Parsing
-`req~escape-sequence-script-options-parsing~1`
-
-The following rules for escape sequences at any place within a script option value are to be applied:
-- '\n' => <line feed> character
-- '\r' => <carriage return> character
-- '\;' => ';' character
-
-Needs: dsn
-
-Tags: V2
-
-Covers:
-- `feat~general-script-options-parsing~1`
-
-
-### Java %scriptclass Option Handling V1
-`req~java-scriptclass-option-handling-v1~1`
-
-The Java parser handler must correctly identify the first `%scriptclass` option and remove only this single instance from the script code. Any further occurrences of `%scriptclass` option shall stay in the source script code.
-The value should be handled according to the [Java specification for identifies](https://docs.oracle.com/javase/specs/jls/se7/html/jls-3.html#jls-3.8).
-
-Needs: dsn
-
-Tags: V1
-
-Covers:
-- `feat~java-specific-script-options~1`
-
-
-### Java %scriptclass Option Handling V2
-`req~java-scriptclass-option-handling-v2~1`
-
-The Java parser handler must correctly identify the first `%scriptclass` option and remove any additional occurrences of this option within the script code.
-The value should be handled according to the [Java specification for identifies](https://docs.oracle.com/javase/specs/jls/se7/html/jls-3.html#jls-3.8).
-
-Needs: dsn
-
-Tags: V2
-
-Covers:
-- `feat~java-specific-script-options~1`
-
-### Java %jar Option Handling Multiple Options
-`req~java-jar-option-handling-multiple-options~1`
-
-Needs: dsn
-
-The Java parser handler must find multiple `%jar` options. The values are to be interpreted as the Java CLASSPATH: `<file1>:<file2>:...:<filen>`. The Java parser handler shall split the entries by the colon character.
-Compare [OpenJdk implementation](https://github.com/AdoptOpenJDK/openjdk-jdk11/blob/19fb8f93c59dfd791f62d41f332db9e306bc1422/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java#L174) of parsing the classpath.
-
-Covers:
-- `feat~java-specific-script-options~1`
-
-
-### Java %jar Option Handling V1
-`req~java-jar-option-handling-v1~1`
-
-The Java parser handler shall unify duplicated files and order the result of all `%jar` options alphabetically.
-
-Needs: dsn
-
-Tags: V1
-
-Covers:
-- `feat~java-specific-script-options~1`
-
-Depends:
-- `req~java-jar-option-handling-multiple-options~1`
-
-### Java %jar Option Handling V2
-`req~java-jar-option-handling-v2~1`
-
-The Java parser handler must keep duplicates. The order of the entries must not change.
-
-Needs: dsn
-
-Tags: V2
-
-Covers:
-- `feat~java-specific-script-options~1`
-
-Depends:
-- `req~java-jar-option-handling-multiple-options~1`
-
-### Java %jar Option Trailing White Space Handling
-`req~java-jar-option-trailing-white-space-handling~1`
-
-The Java parser handler must remove trailing white spaces for `%jar` option values if they are not part of the escape sequence '\ '. Escape sequences at the end of a found `%jar` option of the form `\ ` must be replaced with ' '.
-This approach provides backwards compatibility for most existing UDF's from customers.
-
-Needs: dsn
-
-Tags: V2
-
-Covers:
-- `feat~java-specific-script-options~1`
-
-Depends: 
-- `req~white-spaces-script-options-parsing-v2~1`
-
-### Java %jvmoption Handling
-`req~java-jvmoption-handling~1`
-
-The Java parser handler must find multiple `%jvmoption` options, allowing duplicates and maintaining order.
-
-Needs: dsn
-
-Covers:
-- `feat~java-specific-script-options~1`
-
-### Java %jvmoption Whitespace Handling
-`req~java-jvmoption-whitespace-handling~1`
-
-The Java parser handler must split found Jvm Option value by whitespace character(s).
-
-Needs: dsn
-
-Covers:
-- `feat~java-specific-script-options~1`
-
-### Java %jvmoption Whitespace Escape Handling V2
-`req~java-jvmoption-whitespace-escape-handling-v2~1`
-
-The Java parser handler must detect and replace whitespace escape sequences in Jvm option values and replace them accordingly.
-
-Needs: dsn
-
-Covers:
-- `feat~java-specific-script-options~1`
-
-Tags: V2
-
-### Java %import Option Replace Referenced Sripts
-`req~java-import-option-replace-referenced-scripts~1`
-
-For each found `%import` option, the Java parser handler must request and replace the referenced scripts recursively. This means, if the referenced scripts contain also `%import` options, the implementation must replace those, too.
-
-Needs: dsn
-
-Covers:
-- `feat~java-specific-script-options~1`
-
-### Java %import Option Referenced Sripts Name
-`req~java-import-option-referenced-scripts-name~1`
-
-The referenced script name should be handled according to the [Exasol SQL identifier specification](https://docs.exasol.com/db/latest/sql_references/basiclanguageelements.htm#SQLidentifier).
-
-Needs: dsn
-
-Covers:
-- `feat~java-specific-script-options~1`
-
-### Java %import Option Handling V1
-`req~java-import-option-handling-v1~1`
-
-For each found `%import` option, the Java parser handler must handle nested Script Options appropriately:
-1. `%scriptclass` option must be ignored.
-2. All other options must be handled as if they were part of the source script.
-3. Already imported scripts must not be imported again, but the `%import` statement must be removed
-
-Needs: dsn
-
-Tags: V1
-
-Covers:
-- `feat~java-specific-script-options~1`
-
-### Java %import Option Handling V2
-`req~java-import-option-handling-v2~1`
-
-For each found `%import` option, the Java parser handler must handle nested Script Options appropriately:
-1. `%scriptclass` option must be ignored, but removed from the script code.
-2. All other options must be handled as if they were part of the source script.
-3. Already imported scripts must not be imported again, but the `%import` statement must be removed
-
-Needs: dsn
-
-Tags: V2
-
-Covers:
-- `feat~java-specific-script-options~1`
-
-### Existing Parser Library License
-`req~existing-parser-library-license~1`
-
-Developers must be able to use the parser in open source and closed source projects.
-
-Needs: dsn
-
-Tags: V2
-
-Covers:
-- `feat~general-script-options-parsing~1`
-

From 404a4a372ddaeea6eac9ff2cc233f8075963671f Mon Sep 17 00:00:00 2001
From: "Shankar.KV" <shankar.vaithiyanadhaswamy@exasol.com>
Date: Thu, 27 Aug 2026 18:59:41 +0530
Subject: [PATCH 2/8] Remove java tests and test CI integration

---
 .github/workflows/check_bazel_tests.yml       |   52 +-
 emulator/MY_TEST_JAVA                         |   13 -
 .../javacontainer/script_options/test/BUILD   |   10 -
 .../script_options/test/converter_test.cc     |   92 --
 .../test/ctpg_script_importer_test.cc         |   66 -
 .../script_options/test/string_ops_tests.cc   |   59 -
 .../script_options/test/swig_factory_test.cc  |  105 --
 .../script_options/test/swig_factory_test.h   |   20 -
 exaudfclient/base/javacontainer/test/BUILD    |   60 -
 .../javacontainer/test/cpp/exaudf_wrapper.cc  |   12 -
 .../cpp/javacontainer_extractor_v2_test.cc    |  133 --
 .../test/cpp/javacontainer_perf_test.cc       |   58 -
 .../test/cpp/javacontainer_test.cc            |  609 ---------
 .../javacontainer/test/cpp/javavm_test.cc     |   37 -
 .../base/javacontainer/test/cpp/javavm_test.h |   35 -
 .../test/cpp/swig_factory_test.cc             |  128 --
 .../test/cpp/swig_factory_test.h              |   24 -
 .../com/exasol/ExaStackTraceCleanerTest.java  |   73 --
 .../base/javacontainer/test/other_test.jar    |    0
 exaudfclient/base/javacontainer/test/test.jar |    0
 .../script_options_parser/ctpg/test/BUILD     |    8 -
 .../ctpg/test/script_option_lines_test.cpp    |  337 -----
 .../script_options_parser/legacy/test/BUILD   |    8 -
 .../legacy/test/script_option_lines_test.cpp  |  203 ---
 test_container/build/Dockerfile               |    7 +-
 .../build/deps/maven-toolchains.xml           |   22 -
 .../tests/test/disabled/ldlibrarypath.py      |   27 -
 .../tests/test/generic/java/basic.py          |  300 -----
 .../tests/test/generic/java/combinations.py   |  482 -------
 .../tests/test/generic/java/dynamic_input.py  |  504 --------
 .../tests/test/generic/java/dynamic_output.py |  899 -------------
 .../tests/test/generic/java/emit.py           |  537 --------
 .../tests/test/generic/java/export_alias.py   |  294 -----
 .../tests/test/generic/java/generic_types.py  |  368 ------
 .../tests/test/generic/java/get_connection.py |  138 --
 .../tests/test/generic/java/import_alias.py   |  258 ----
 .../tests/test/generic/java/metadata.py       |  508 --------
 .../test/generic/java/numeric_functions.py    |  191 ---
 .../generic/java/pathological_functions.py    |   35 -
 .../tests/test/generic/java/performance.py    |  117 --
 .../tests/test/generic/java/unicode.py        |  264 ----
 .../tests/test/generic/java/vectorsize.py     |  168 ---
 .../test/generic/python3/dynamic_input.py     |    6 +-
 .../test/generic/python3/dynamic_output.py    |    4 -
 .../tests/test/generic/python3/metadata.py    |   18 +-
 .../tests/test/generic/python3/vectorsize.py  |    3 +-
 .../tests/test/generic/r/vectorsize.py        |    1 -
 test_container/tests/test/java/bugs.py        |   30 -
 test_container/tests/test/java/context.py     |  134 --
 test_container/tests/test/java/exceptions.py  |  265 ----
 .../tests/test/java/external_jar_files.py     |   83 --
 test_container/tests/test/java/general.py     |  863 ------------
 .../tests/test/java/java_modules.py           |  115 --
 .../tests/test/java/jvm_owned_native_libs.py  |  116 --
 test_container/tests/test/java/network.py     |  110 --
 .../resources/hadoop_etl_udf/hadoop-hive.env  |   30 -
 .../java/resources/hadoop_etl_udf/retail.sql  |   20 -
 .../test/java/resources/java_udf/pom.xml      |   76 --
 .../java/com/exasol/slc/testudf/Main.java     |   34 -
 .../java_udf/src/main/java/module-info.java   |    4 -
 .../tests/test/java/script_import.py          |  662 ----------
 .../tests/test/java/specific_types.py         | 1152 -----------------
 .../tests/test/java/test_hadoop_etl_udfs.py   |  249 ----
 test_container/tests/test/java/timezone.py    |   88 --
 test_container/tests/test/java/unicode.py     |   54 -
 .../performance/abstract_performance_test.py  |    2 +-
 .../java_scalar_emit_consume_columns.py       |   52 -
 .../java_scalar_emit_consume_next_only.py     |   41 -
 .../java_set_emit_consume_columns.py          |   56 -
 .../java_set_emit_consume_next_only.py        |   45 -
 .../performance/java_set_emit_output_only.py  |   43 -
 .../performance/java_set_emit_start_only.py   |   33 -
 ...ava_scalar_emit_consume_emit_very_large.py |   65 -
 73 files changed, 17 insertions(+), 11698 deletions(-)
 delete mode 100644 emulator/MY_TEST_JAVA
 delete mode 100644 exaudfclient/base/javacontainer/script_options/test/BUILD
 delete mode 100644 exaudfclient/base/javacontainer/script_options/test/converter_test.cc
 delete mode 100644 exaudfclient/base/javacontainer/script_options/test/ctpg_script_importer_test.cc
 delete mode 100644 exaudfclient/base/javacontainer/script_options/test/string_ops_tests.cc
 delete mode 100644 exaudfclient/base/javacontainer/script_options/test/swig_factory_test.cc
 delete mode 100644 exaudfclient/base/javacontainer/script_options/test/swig_factory_test.h
 delete mode 100644 exaudfclient/base/javacontainer/test/BUILD
 delete mode 100644 exaudfclient/base/javacontainer/test/cpp/exaudf_wrapper.cc
 delete mode 100644 exaudfclient/base/javacontainer/test/cpp/javacontainer_extractor_v2_test.cc
 delete mode 100644 exaudfclient/base/javacontainer/test/cpp/javacontainer_perf_test.cc
 delete mode 100644 exaudfclient/base/javacontainer/test/cpp/javacontainer_test.cc
 delete mode 100644 exaudfclient/base/javacontainer/test/cpp/javavm_test.cc
 delete mode 100644 exaudfclient/base/javacontainer/test/cpp/javavm_test.h
 delete mode 100644 exaudfclient/base/javacontainer/test/cpp/swig_factory_test.cc
 delete mode 100644 exaudfclient/base/javacontainer/test/cpp/swig_factory_test.h
 delete mode 100644 exaudfclient/base/javacontainer/test/java/com/exasol/ExaStackTraceCleanerTest.java
 delete mode 100644 exaudfclient/base/javacontainer/test/other_test.jar
 delete mode 100644 exaudfclient/base/javacontainer/test/test.jar
 delete mode 100644 exaudfclient/base/script_options_parser/ctpg/test/BUILD
 delete mode 100644 exaudfclient/base/script_options_parser/ctpg/test/script_option_lines_test.cpp
 delete mode 100644 exaudfclient/base/script_options_parser/legacy/test/BUILD
 delete mode 100644 exaudfclient/base/script_options_parser/legacy/test/script_option_lines_test.cpp
 delete mode 100644 test_container/build/deps/maven-toolchains.xml
 delete mode 100755 test_container/tests/test/generic/java/basic.py
 delete mode 100755 test_container/tests/test/generic/java/combinations.py
 delete mode 100755 test_container/tests/test/generic/java/dynamic_input.py
 delete mode 100644 test_container/tests/test/generic/java/dynamic_output.py
 delete mode 100644 test_container/tests/test/generic/java/emit.py
 delete mode 100644 test_container/tests/test/generic/java/export_alias.py
 delete mode 100755 test_container/tests/test/generic/java/generic_types.py
 delete mode 100644 test_container/tests/test/generic/java/get_connection.py
 delete mode 100644 test_container/tests/test/generic/java/import_alias.py
 delete mode 100755 test_container/tests/test/generic/java/metadata.py
 delete mode 100755 test_container/tests/test/generic/java/numeric_functions.py
 delete mode 100755 test_container/tests/test/generic/java/pathological_functions.py
 delete mode 100644 test_container/tests/test/generic/java/performance.py
 delete mode 100755 test_container/tests/test/generic/java/unicode.py
 delete mode 100755 test_container/tests/test/generic/java/vectorsize.py
 delete mode 100755 test_container/tests/test/java/bugs.py
 delete mode 100644 test_container/tests/test/java/context.py
 delete mode 100755 test_container/tests/test/java/exceptions.py
 delete mode 100644 test_container/tests/test/java/external_jar_files.py
 delete mode 100755 test_container/tests/test/java/general.py
 delete mode 100644 test_container/tests/test/java/java_modules.py
 delete mode 100644 test_container/tests/test/java/jvm_owned_native_libs.py
 delete mode 100755 test_container/tests/test/java/network.py
 delete mode 100644 test_container/tests/test/java/resources/hadoop_etl_udf/hadoop-hive.env
 delete mode 100644 test_container/tests/test/java/resources/hadoop_etl_udf/retail.sql
 delete mode 100644 test_container/tests/test/java/resources/java_udf/pom.xml
 delete mode 100644 test_container/tests/test/java/resources/java_udf/src/main/java/com/exasol/slc/testudf/Main.java
 delete mode 100644 test_container/tests/test/java/resources/java_udf/src/main/java/module-info.java
 delete mode 100755 test_container/tests/test/java/script_import.py
 delete mode 100755 test_container/tests/test/java/specific_types.py
 delete mode 100644 test_container/tests/test/java/test_hadoop_etl_udfs.py
 delete mode 100644 test_container/tests/test/java/timezone.py
 delete mode 100755 test_container/tests/test/java/unicode.py
 delete mode 100644 test_container/tests/test/performance/java_scalar_emit_consume_columns.py
 delete mode 100644 test_container/tests/test/performance/java_scalar_emit_consume_next_only.py
 delete mode 100644 test_container/tests/test/performance/java_set_emit_consume_columns.py
 delete mode 100644 test_container/tests/test/performance/java_set_emit_consume_next_only.py
 delete mode 100644 test_container/tests/test/performance/java_set_emit_output_only.py
 delete mode 100644 test_container/tests/test/performance/java_set_emit_start_only.py
 delete mode 100644 test_container/tests/test/performance/very_large/java_scalar_emit_consume_emit_very_large.py

diff --git a/.github/workflows/check_bazel_tests.yml b/.github/workflows/check_bazel_tests.yml
index 5c86089..14e0131 100644
--- a/.github/workflows/check_bazel_tests.yml
+++ b/.github/workflows/check_bazel_tests.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Build
         run: |
           source "$UDF_CLIENT_ENV_FILE"
-          bazel build --lockfile_mode=off --config no-tty -c dbg --config python --config java --config fast-binary --verbose_failures
+          bazel build --lockfile_mode=off --config no-tty -c dbg --config python --config fast-binary --verbose_failures
         working-directory: ./exaudfclient/
 
   tests:
@@ -32,60 +32,14 @@ jobs:
      fail-fast: false
      matrix:
         include:
-          - test: "//javacontainer/test:ExaStackTraceCleanerTest"
-            name: "ExaStackTraceCleanerTest"
-            java_version: "openjdk-11-jdk"
-          - test: "//javacontainer/test:ExaStackTraceCleanerTest"
-            name: "ExaStackTraceCleanerTest"
-            java_version: "openjdk-17-jdk"
-          - test: "//javacontainer/test:javacontainer-test-extractor-legacy"
-            name: "javacontainer-test-extractor-legacy"
-            java_version: "openjdk-11-jdk"
-          - test: "//javacontainer/test:javacontainer-test-extractor-v2"
-            name: "javacontainer-test-extractor-v2"
-            java_version: "openjdk-11-jdk"
-          - test: "//javacontainer/script_options/..."
-            name: "javacontainer-script_options"
-            java_version: ""
           - test: "//exaudflib/test/..."
             name: "exaudflib"
-            java_version: ""
-          - test: "//script_options_parser/ctpg/..."
-            name: "script_options_parser_ctpg"
-            java_version: ""
-          - test: "//script_options_parser/legacy/..."
-            name: "script_options_parser_legacy"
-            java_version: ""
-          - test: "--run_under='valgrind --leak-check=yes' --config=valgrind //javacontainer/test:javacontainer-test-extractor-legacy"
-            name: "javacontainer-test-extractor-legacy-with-valgrind"
-            java_version: "openjdk-11-jdk"
-          - test: "--run_under='valgrind --leak-check=yes' --config=valgrind //javacontainer/test:javacontainer-test-extractor-v2"
-            name: "javacontainer-test-extractor-v2-with-valgrind"
-            java_version: "openjdk-11-jdk"
-          - test: "--run_under='valgrind --leak-check=yes' --config=valgrind //script_options_parser/ctpg/..."
-            name: "script_options_parser_ctpg_with_valgrind"
-            java_version: ""
-          - test: "--run_under='valgrind --leak-check=yes' --config=valgrind //script_options_parser/legacy/..."
-            name: "script_options_parser_legacy_with_valgrind"
-            java_version: ""
-          - test: "--config=asan //javacontainer/test:javacontainer-test-extractor-legacy"
-            name: "javacontainer-test-extractor-legacy-with-asan"
-            java_version: "openjdk-11-jdk"
-          - test: "--config=asan //javacontainer/test:javacontainer-test-extractor-v2"
-            name: "javacontainer-test-extractor-v2-with-asan"
-            java_version: "openjdk-11-jdk"
-          - test: "--config=asan //script_options_parser/ctpg/..."
-            name: "script_options_parser_ctpg_with_asan"
-            java_version: ""
-          - test: "--config=asan //script_options_parser/legacy/..."
-            name: "script_options_parser_legacy_with_asan"
-            java_version: ""
     steps:
       - uses: actions/checkout@v6
-      - name: Install JDK and ZMQ
+      - name: Install ZMQ
         run: |
           sudo apt-get update
-          sudo apt-get install -y ${{ matrix.java_version }} libzmq3-dev valgrind
+          sudo apt-get install -y libzmq3-dev valgrind
       - name: Install bazel
         run: | 
           BAZEL_PACKAGE_FILE="bazel_$BAZEL_PACKAGE_VERSION-linux-x86_64.deb"
diff --git a/emulator/MY_TEST_JAVA b/emulator/MY_TEST_JAVA
deleted file mode 100644
index 85d093a..0000000
--- a/emulator/MY_TEST_JAVA
+++ /dev/null
@@ -1,13 +0,0 @@
-//input_column: a,int64,INT,None,None,None
-//input_column: b,string,VARCHAR(100),100,None,None
-//input_type: SET
-
-//output_column: a,int64,INT,None,None,None
-//output_column: b,string,VARCHAR(100),100,None,None
-//output_type: EMITS
-class MY_TEST_JAVA {
- static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-  String str = ctx.getString("b");
-  ctx.emit(1,str);
- }
-}
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/script_options/test/BUILD b/exaudfclient/base/javacontainer/script_options/test/BUILD
deleted file mode 100644
index 76f9bf6..0000000
--- a/exaudfclient/base/javacontainer/script_options/test/BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-
-cc_test(
-    name = "java-script-options-tests",
-    srcs = ["ctpg_script_importer_test.cc", "swig_factory_test.cc",
-            "swig_factory_test.h", "string_ops_tests.cc", "converter_test.cc"],
-    deps = [
-        "//javacontainer/script_options:java_script_option_lines",
-        "@googletest//:gtest_main",
-    ],
-)
diff --git a/exaudfclient/base/javacontainer/script_options/test/converter_test.cc b/exaudfclient/base/javacontainer/script_options/test/converter_test.cc
deleted file mode 100644
index ba640e7..0000000
--- a/exaudfclient/base/javacontainer/script_options/test/converter_test.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-
-#include "include/gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "javacontainer/script_options/converter_legacy.h"
-#include "javacontainer/script_options/converter_v2.h"
-
-using namespace SWIGVMContainers::JavaScriptOptions;
-
-
-class LegacyConverterJarTest : public ::testing::TestWithParam<std::pair<std::string, std::vector<std::string>>> {};
-
-TEST_P(LegacyConverterJarTest, jar) {
-    const std::pair<std::string, std::vector<std::string>> option_value = GetParam();
-    const std::string jar_option_value = option_value.first;
-
-    ConverterLegacy converter;
-    converter.convertExternalJar(option_value.first);
-    std::vector<std::string> result;
-    converter.iterateJarPaths([&](auto jar) {result.push_back(jar);});
-    ASSERT_EQ(result, option_value.second);
-}
-
-const std::vector<std::pair<std::string, std::vector<std::string>>> jar_strings =
-        {
-            std::make_pair("test.jar:test2.jar", std::vector<std::string>({"test.jar", "test2.jar"})), //basic splitting
-            std::make_pair("test.jar:test.jar", std::vector<std::string>({"test.jar"})), //filter duplicates
-            std::make_pair("testDEF.jar:testABC.jar", std::vector<std::string>({"testABC.jar", "testDEF.jar"})), //alphabetical order
-        };
-
-INSTANTIATE_TEST_SUITE_P(
-    Converter,
-    LegacyConverterJarTest,
-    ::testing::ValuesIn(jar_strings)
-);
-
-
-
-class ConverterV2JarTest : public ::testing::TestWithParam<std::pair<std::string, std::vector<std::string>>> {};
-
-TEST_P(ConverterV2JarTest, jar) {
-    const std::pair<std::string, std::vector<std::string>> option_value = GetParam();
-    const std::string jar_option_value = option_value.first;
-
-    ConverterV2 converter;
-    converter.convertExternalJar(option_value.first);
-    std::vector<std::string> result;
-    converter.iterateJarPaths([&](auto jar) {result.push_back(jar);});
-    ASSERT_EQ(result, option_value.second);
-}
-
-const std::vector<std::pair<std::string, std::vector<std::string>>> jar_strings_v2 =
-        {
-            std::make_pair("test.jar:test2.jar", std::vector<std::string>({"test.jar", "test2.jar"})), //basic splitting
-            std::make_pair("test.jar:test.jar", std::vector<std::string>({"test.jar", "test.jar"})), //keep duplicates
-            std::make_pair("testDEF.jar:testABC.jar", std::vector<std::string>({"testDEF.jar", "testABC.jar"})), //maintain order
-        };
-
-INSTANTIATE_TEST_SUITE_P(
-    Converter,
-    ConverterV2JarTest,
-    ::testing::ValuesIn(jar_strings_v2)
-);
-
-class ConverterV2JvmOptionsTest : public ::testing::TestWithParam<std::pair<std::string, std::vector<std::string>>> {};
-
-TEST_P(ConverterV2JvmOptionsTest, jvm_option) {
-    const std::pair<std::string, std::vector<std::string>> option_value = GetParam();
-    const std::string jvm_option_value = option_value.first;
-
-    ConverterV2 converter;
-    converter.convertJvmOption(option_value.first);
-    std::vector<std::string> result = std::move(converter.moveJvmOptions());
-    ASSERT_EQ(result, option_value.second);
-}
-
-const std::vector<std::pair<std::string, std::vector<std::string>>> jvm_options_strings_v2 =
-        {
-            std::make_pair("optionA=abc optionB=def", std::vector<std::string>({"optionA=abc", "optionB=def"})),
-            std::make_pair("optionA=abc\\ def optionB=ghi", std::vector<std::string>({"optionA=abc def", "optionB=ghi"})),
-            std::make_pair("optionA=abc\\tdef optionB=ghi", std::vector<std::string>({"optionA=abc\tdef", "optionB=ghi"})),
-            std::make_pair("   optionA=abc\\tdef optionB=ghi", std::vector<std::string>({"optionA=abc\tdef", "optionB=ghi"})),
-            std::make_pair("   optionA=abc\\tdef\\\\\t\t optionB=ghi", std::vector<std::string>({"optionA=abc\tdef\\", "optionB=ghi"})),
-            std::make_pair("   optionA=abc\\tdef\\\\\\t\\t optionB=ghi", std::vector<std::string>({"optionA=abc\tdef\\\t\t", "optionB=ghi"})),
-            std::make_pair("   optionA=abc\\tdef\\\\\\t\\t optionB=ghi   ", std::vector<std::string>({"optionA=abc\tdef\\\t\t", "optionB=ghi"})),
-            std::make_pair("   optionA=abc\\tdef\\\\\\t\\t optionB=ghi\\ \\t   ", std::vector<std::string>({"optionA=abc\tdef\\\t\t", "optionB=ghi \t"}))
-        };
-
-INSTANTIATE_TEST_SUITE_P(
-    Converter,
-    ConverterV2JvmOptionsTest,
-    ::testing::ValuesIn(jvm_options_strings_v2)
-);
diff --git a/exaudfclient/base/javacontainer/script_options/test/ctpg_script_importer_test.cc b/exaudfclient/base/javacontainer/script_options/test/ctpg_script_importer_test.cc
deleted file mode 100644
index 1efbadc..0000000
--- a/exaudfclient/base/javacontainer/script_options/test/ctpg_script_importer_test.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-
-#include "include/gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "javacontainer/script_options/parser_ctpg.h"
-
-#include "javacontainer/script_options/test/swig_factory_test.h"
-#include <string.h>
-
-using namespace SWIGVMContainers::JavaScriptOptions;
-
-
-static const char* sc_scriptName = "script";
-
-
-void checkIndex(size_t currentIdx, const char* scriptKey) {
-    std::stringstream ss;
-    ss << sc_scriptName << currentIdx;
-    if (ss.str() != scriptKey) {
-        throw std::logic_error(std::string("Script Key does not match: '") + ss.str() + " != '" + scriptKey + "'");
-    }
-}
-
-const char* buildNewScriptCode(size_t currentIdx) {
-    std::stringstream ss;
-    ss << "%import " << sc_scriptName << currentIdx << ";something";
-    static std::string ret;
-    ret = ss.str();
-    return ret.c_str();
-}
-
-TEST(ScriptImporterTest, max_recursion_depth) {
-    /**
-       This test checks that running an infinite recursion of the script import will result in the expected exception.
-       For that, the test creates new "import scripts" on the fly:
-       Whenever the parser finds a new 'import script' option,
-       it calls SWIGVMContainers::SWIGMetadataIf::moduleContent().
-       The mocked implementation redirects this request to `buildNewScriptCode()` which creates a
-       new dummy import script with another '%import ...` option.
-     */
-
-    size_t currentIdx = 0;
-    std::unique_ptr<SWIGVMContainers::SwigFactory> swigFactory =
-            std::make_unique<SwigFactoryTestImpl>([&](const char* scriptKey) {
-                        checkIndex(currentIdx, scriptKey);
-                        return buildNewScriptCode(++currentIdx);
-                       });
-    ScriptOptionLinesParserCTPG parser(std::move(swigFactory));
-
-    const std::string code = buildNewScriptCode(currentIdx);
-    parser.prepareScriptCode(code);
-    EXPECT_THROW({
-        try
-        {
-            parser.extractImportScripts();
-        }
-        catch( const std::runtime_error& e )
-        {
-            //We need to deceive "find_duplicate_error_codes.sh" here
-            const std::string expectedError =
-                std::string("F-UDF-CL-SL-JAVA-") + "1633: Maximal recursion depth for importing scripts reached.";
-            EXPECT_STREQ( expectedError.c_str(), e.what());
-            throw;
-        }
-    }, std::runtime_error );
-}
-
diff --git a/exaudfclient/base/javacontainer/script_options/test/string_ops_tests.cc b/exaudfclient/base/javacontainer/script_options/test/string_ops_tests.cc
deleted file mode 100644
index 9615212..0000000
--- a/exaudfclient/base/javacontainer/script_options/test/string_ops_tests.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-
-#include "include/gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "javacontainer/script_options/string_ops.h"
-
-using namespace SWIGVMContainers::JavaScriptOptions;
-
-
-
-
-TEST(StringOpsTest, trim) {
-    std::string sample = " \tHello World \t";
-    StringOps::trim(sample);
-    EXPECT_EQ(sample, "Hello World");
-}
-
-TEST(StringOpsTest, trimWithNoneASCII) {
-    /*
-    Test that trim works correctly with None-ASCII characters
-    \xa0's bit sequence is '1010 0000', while space bit sequence '0010 0000'.
-    If StringOps::trim() would not work correctly with characters where MSB is set, it would interpret \xa0 as space.
-    */
-    std::string sample = " \t\xa0Hello World\xa0 \t";
-    StringOps::trim(sample);
-    EXPECT_EQ(sample, "\xa0Hello World\xa0");
-}
-
-class ReplaceTrailingEscapeWhitespacesTest : public ::testing::TestWithParam<std::pair<std::string, std::string>> {};
-
-TEST_P(ReplaceTrailingEscapeWhitespacesTest, s) {
-    const std::pair<std::string, std::string> underTest = GetParam();
-
-    std::string str = underTest.first;
-    StringOps::replaceTrailingEscapeWhitespaces(str);
-    ASSERT_EQ(str, underTest.second);
-}
-
-const std::vector<std::pair<std::string, std::string>> replace_trailing_escape_whitespaces_strings =
-        {
-            std::make_pair("hello world", std::string("hello world")),
-            std::make_pair("hello world ", std::string("hello world")),
-            std::make_pair("hello world\\t", std::string("hello world\t")),
-            std::make_pair("hello world\\f", std::string("hello world\f")),
-            std::make_pair("hello world\\v", std::string("hello world\v")),
-            std::make_pair("hello world\\\\t", std::string("hello world\\t")),
-            std::make_pair("hello world\\\\t\t", std::string("hello world\\t")),
-            std::make_pair("hello world\\\\\\t\t", std::string("hello world\\\t")),
-            std::make_pair("hello world\\\\\\\\t\t", std::string("hello world\\\\t")),
-            std::make_pair("hello worl\td\\\\\\\\t\t", std::string("hello worl\td\\\\t")),
-            std::make_pair("t\t ", std::string("t")),
-            std::make_pair("hello worl\td\\\\\\\\", std::string("hello worl\td\\\\\\\\")), //If no whitespace escape sequence, backslashes are not interpreted as backslash escape sequence
-        };
-
-
-INSTANTIATE_TEST_SUITE_P(
-    StringOpsTest,
-    ReplaceTrailingEscapeWhitespacesTest,
-    ::testing::ValuesIn(replace_trailing_escape_whitespaces_strings)
-);
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/script_options/test/swig_factory_test.cc b/exaudfclient/base/javacontainer/script_options/test/swig_factory_test.cc
deleted file mode 100644
index adca665..0000000
--- a/exaudfclient/base/javacontainer/script_options/test/swig_factory_test.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "javacontainer/script_options/test/swig_factory_test.h"
-#include "exaudflib/swig/swig_meta_data.h"
-
-#include <stdexcept>
-
-class NotImplemented : public std::logic_error
-{
-public:
-    NotImplemented() : std::logic_error("Function not yet implemented") { };
-    NotImplemented(const std::string funcName) : std::logic_error("Function " + funcName + " not yet implemented") { };
-};
-
-class SWIGMetadataTest : public SWIGVMContainers::SWIGMetadataIf {
-
-public:
-    SWIGMetadataTest(std::function<const char*(const char*)> callback): m_callback(callback)  {}
-    virtual const char* databaseName() { throw NotImplemented("databaseName"); return nullptr;}
-    virtual const char* databaseVersion() { throw NotImplemented("databaseVersion"); return nullptr;}
-    virtual const char* scriptName() { throw NotImplemented("scriptName"); return nullptr;}
-    virtual const char* scriptSchema() { throw NotImplemented("scriptSchema"); return nullptr;}
-    virtual const char* currentUser() { throw NotImplemented("currentUser"); return nullptr;}
-    virtual const char* scopeUser() { throw NotImplemented("scopeUser"); return nullptr;}
-    virtual const char* currentSchema() { throw NotImplemented("currentSchema"); return nullptr;}
-    virtual const char* scriptCode() { throw NotImplemented("scriptCode"); return nullptr;}
-    virtual const unsigned long long sessionID() { throw NotImplemented("sessionID"); return 0;}
-    virtual const char *sessionID_S() { throw NotImplemented("sessionID_S"); return nullptr;}
-    virtual const unsigned long statementID() { throw NotImplemented("statementID"); return 0;}
-    virtual const unsigned int nodeCount() { throw NotImplemented("nodeCount"); return 0;}
-    virtual const unsigned int nodeID() { throw NotImplemented("nodeID"); return 0;}
-    virtual const unsigned long long vmID() { throw NotImplemented("vmID"); return 0;}
-    virtual const unsigned long long memoryLimit() { throw NotImplemented("memoryLimit"); return 0;}
-    virtual const SWIGVMContainers::VMTYPE vmType() {
-        throw NotImplemented("vmType");
-        return SWIGVMContainers::VM_UNSUPPORTED;
-    }
-    virtual const char *vmID_S() { throw NotImplemented("vmID_S"); return nullptr;}
-    virtual const ExecutionGraph::ConnectionInformationWrapper* connectionInformation(const char* connection_name) {
-        throw NotImplemented("connectionInformation"); return nullptr;
-    }
-    virtual const char* moduleContent(const char* name) {
-        return m_callback(name);
-    }
-    virtual const unsigned int inputColumnCount() { throw NotImplemented("inputColumnCount"); return 0;}
-    virtual const char *inputColumnName(unsigned int col) {
-        throw NotImplemented("inputColumnName");
-        return nullptr;
-    }
-    virtual const SWIGVMContainers::SWIGVM_datatype_e inputColumnType(unsigned int col) {
-        throw NotImplemented("inputColumnType");
-        return SWIGVMContainers::UNSUPPORTED;
-    }
-    virtual const char *inputColumnTypeName(unsigned int col) {
-        throw NotImplemented("inputColumnTypeName"); return nullptr;
-    }
-    virtual const unsigned int inputColumnSize(unsigned int col) {
-        throw NotImplemented("inputColumnSize"); return 0;
-    }
-    virtual const unsigned int inputColumnPrecision(unsigned int col) {
-        throw NotImplemented("inputColumnPrecision"); return 0;
-    }
-    virtual const unsigned int inputColumnScale(unsigned int col) {
-        throw NotImplemented("inputColumnScale"); return 0;
-    }
-    virtual const SWIGVMContainers::SWIGVM_itertype_e inputType() {
-        throw NotImplemented("inputType");
-        return SWIGVMContainers::EXACTLY_ONCE;
-    }
-    virtual const unsigned int outputColumnCount() { throw NotImplemented("outputColumnCount"); return 0;}
-    virtual const char *outputColumnName(unsigned int col) { throw NotImplemented("outputColumnName"); return nullptr;}
-    virtual const SWIGVMContainers::SWIGVM_datatype_e outputColumnType(unsigned int col) {
-        throw NotImplemented("outputColumnType");
-        return SWIGVMContainers::UNSUPPORTED;
-    }
-    virtual const char *outputColumnTypeName(unsigned int col) {
-        throw NotImplemented("outputColumnTypeName"); return nullptr;
-    }
-    virtual const unsigned int outputColumnSize(unsigned int col) {
-        throw NotImplemented("outputColumnSize"); return 0;
-    }
-    virtual const unsigned int outputColumnPrecision(unsigned int col) {
-        throw NotImplemented("outputColumnPrecision"); return 0;
-    }
-    virtual const unsigned int outputColumnScale(unsigned int col) {
-        throw NotImplemented("outputColumnScale"); return 0;
-    }
-    virtual const SWIGVMContainers::SWIGVM_itertype_e outputType() {
-        throw NotImplemented("outputType");
-        return SWIGVMContainers::EXACTLY_ONCE;
-    }
-    virtual const bool isEmittedColumn(unsigned int col) { throw NotImplemented("isEmittedColumn"); return false;}
-    virtual const char* checkException() { return nullptr;}
-    virtual const char* pluginLanguageName() { throw NotImplemented("pluginLanguageName"); return nullptr;}
-    virtual const char* pluginURI() { throw NotImplemented("pluginURI"); return nullptr;}
-    virtual const char* outputAddress() { throw NotImplemented("outputAddress"); return nullptr;}
-
-private:
-    std::function<const char*(const char*)> m_callback;
-};
-
-SwigFactoryTestImpl::SwigFactoryTestImpl(std::function<const char*(const char*)> callback)
-: m_callback(callback) {}
-
-SWIGVMContainers::SWIGMetadataIf* SwigFactoryTestImpl::makeSwigMetadata() {
-    return new SWIGMetadataTest(m_callback);
-}
diff --git a/exaudfclient/base/javacontainer/script_options/test/swig_factory_test.h b/exaudfclient/base/javacontainer/script_options/test/swig_factory_test.h
deleted file mode 100644
index b98f144..0000000
--- a/exaudfclient/base/javacontainer/script_options/test/swig_factory_test.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef SWIG_FACTORY_TEST_H
-#define SWIG_FACTORY_TEST_H 1
-
-#include <string>
-#include <map>
-#include "swig_factory/swig_factory.h"
-#include <functional>
-
-struct SwigFactoryTestImpl : public SWIGVMContainers::SwigFactory {
-
-    SwigFactoryTestImpl(std::function<const char*(const char*)> callback);
-
-    virtual SWIGVMContainers::SWIGMetadataIf* makeSwigMetadata() override;
-
-private:
-    std::function<const char*(const char*)> m_callback;
-};
-
-
-#endif //namespace SWIG_FACTORY_TEST_H
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/test/BUILD b/exaudfclient/base/javacontainer/test/BUILD
deleted file mode 100644
index 69ff84f..0000000
--- a/exaudfclient/base/javacontainer/test/BUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-java_library(
-    name = "ExaStackTraceCleaner",
-    srcs = ["//javacontainer:ExaStackTraceCleaner.java"]
-)
-
-java_test(
-    name = "ExaStackTraceCleanerTest",
-    srcs = ["java/com/exasol/ExaStackTraceCleanerTest.java"],
-    size = "small",
-    deps = [":ExaStackTraceCleaner"]
-)
-
-JAVACONTAINER_TEST_SRCS = ["cpp/javacontainer_test.cc", "cpp/exaudf_wrapper.cc", "cpp/javavm_test.cc", "cpp/javavm_test.h",
-            "cpp/swig_factory_test.h", "cpp/swig_factory_test.cc"]
-
-JAVACONTAINER_PERF_TEST_SRCS = ["cpp/javacontainer_perf_test.cc", "cpp/exaudf_wrapper.cc", "cpp/javavm_test.cc", "cpp/javavm_test.h",
-            "cpp/swig_factory_test.h", "cpp/swig_factory_test.cc"]
-
-cc_test(
-    name = "javacontainer-test-extractor-legacy",
-    srcs = JAVACONTAINER_TEST_SRCS,
-    deps = [
-        "//javacontainer:javacontainer",
-        "@googletest//:gtest_main",
-    ],
-    data = ["test.jar", "other_test.jar"]
-)
-
-cc_test(
-    name = "javacontainer-test-extractor-v2",
-    srcs = JAVACONTAINER_TEST_SRCS + ["cpp/javacontainer_extractor_v2_test.cc"],
-    deps = [
-        "//javacontainer:javacontainer",
-        "@googletest//:gtest_main",
-    ],
-    defines = ["USE_EXTRACTOR_V2"],
-    data = ["test.jar", "other_test.jar"]
-)
-
-
-cc_test(
-    name = "javacontainer-perf-test-legacy-parser",
-    srcs = JAVACONTAINER_PERF_TEST_SRCS,
-    deps = [
-        "//javacontainer:javacontainer",
-        "@googletest//:gtest_main",
-    ],
-    data = ["test.jar", "other_test.jar"]
-)
-
-cc_test(
-    name = "javacontainer-perf-test-ctpg-parser",
-    srcs = JAVACONTAINER_PERF_TEST_SRCS,
-    deps = [
-        "//javacontainer:javacontainer",
-        "@googletest//:gtest_main",
-    ],
-    defines = ["USE_EXTRACTOR_V2"],
-    data = ["test.jar", "other_test.jar"]
-)
diff --git a/exaudfclient/base/javacontainer/test/cpp/exaudf_wrapper.cc b/exaudfclient/base/javacontainer/test/cpp/exaudf_wrapper.cc
deleted file mode 100644
index 274c19b..0000000
--- a/exaudfclient/base/javacontainer/test/cpp/exaudf_wrapper.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "exaudflib/swig/swig_common.h"
-
-//Dummy implementation to calm down the linker
-void* load_dynamic(const char* name) {
-    return nullptr;
-}
-
-//Globalinstance of the SWIGVM_params which we used to communicate with JavaVMImpl;
-namespace SWIGVMContainers {
-SWIGVM_params_t gSWIGVM_params_t;
-__thread SWIGVM_params_t * SWIGVM_params = &gSWIGVM_params_t;
-}
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/test/cpp/javacontainer_extractor_v2_test.cc b/exaudfclient/base/javacontainer/test/cpp/javacontainer_extractor_v2_test.cc
deleted file mode 100644
index 3f5308e..0000000
--- a/exaudfclient/base/javacontainer/test/cpp/javacontainer_extractor_v2_test.cc
+++ /dev/null
@@ -1,133 +0,0 @@
-
-#include "include/gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "javacontainer/test/cpp/javavm_test.h"
-#include "javacontainer/test/cpp/swig_factory_test.h"
-#include "javacontainer/javacontainer.h"
-#include <string.h>
-#include <memory>
-
-using ::testing::MatchesRegex;
-
-class JavaContainerEscapeSequenceTest : public ::testing::TestWithParam<std::pair<std::string, std::string>> {};
-
-TEST_P(JavaContainerEscapeSequenceTest, quoted_jvm_option) {
-const std::pair<std::string, std::string> option_value = GetParam();
-    const std::string script_code =
-        "%jvmoption " + option_value.first + ";\n\n"
-        "class JVMOPTION_TEST_WITH_SPACE {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "	ctx.emit(\"Success!\");\n"
-        " }\n"
-        "}\n";
-    JavaVMTest vm(script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    const std::string expected_script_code =
-        "package com.exasol;\r\n\n\n"
-        "class JVMOPTION_TEST_WITH_SPACE {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "\tctx.emit(\"Success!\");\n"
-         " }\n}\n";
-    EXPECT_EQ(expected_script_code, vm.getJavaVMInternalStatus().m_scriptCode);
-    EXPECT_EQ("/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar", vm.getJavaVMInternalStatus().m_exaJarPath);
-    EXPECT_EQ("/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar", vm.getJavaVMInternalStatus().m_classpath);
-    EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation);
-
-    const std::vector<std::string> expectedJVMOptions = {   option_value.second, "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(expectedJVMOptions, vm.getJavaVMInternalStatus().m_jvmOptions);
-}
-
-const std::vector<std::pair<std::string, std::string>> escape_sequences =
-        {
-            std::make_pair("-Dhttp.agent=ABC\\nDEF", "-Dhttp.agent=ABC\nDEF"),
-            std::make_pair("-Dhttp.agent=ABC\\rDEF", "-Dhttp.agent=ABC\rDEF"),
-            std::make_pair("-Dhttp.agent=ABC\\;DEF", "-Dhttp.agent=ABC;DEF"),
-            std::make_pair("-Dhttp.agent=ABC\\aDEF", "-Dhttp.agent=ABC\\aDEF"), //any other escape sequence must stay as is
-            std::make_pair("\\n-Dhttp.agent=ABCDEF", "\n-Dhttp.agent=ABCDEF"),
-            std::make_pair("\\r-Dhttp.agent=ABCDEF", "\r-Dhttp.agent=ABCDEF"),
-            std::make_pair("\\;-Dhttp.agent=ABCDEF", ";-Dhttp.agent=ABCDEF"),
-            std::make_pair("-Dhttp.agent=ABCDEF\\n", "-Dhttp.agent=ABCDEF\n"),
-            std::make_pair("-Dhttp.agent=ABCDEF\\r", "-Dhttp.agent=ABCDEF\r"),
-            std::make_pair("-Dhttp.agent=ABCDEF\\;", "-Dhttp.agent=ABCDEF;"),
-            std::make_pair("\\ -Dhttp.agent=ABCDEF", "-Dhttp.agent=ABCDEF"),
-            std::make_pair("\\t-Dhttp.agent=ABCDEF", "-Dhttp.agent=ABCDEF"),
-            std::make_pair("\\f-Dhttp.agent=ABCDEF", "-Dhttp.agent=ABCDEF"),
-            std::make_pair("\\v-Dhttp.agent=ABCDEF", "-Dhttp.agent=ABCDEF"),
-            std::make_pair("\\v-Dhttp.agent=ABC\\tDEF", "-Dhttp.agent=ABC\tDEF"),
-            std::make_pair("\\v-Dhttp.agent=ABC\\ DEF", "-Dhttp.agent=ABC DEF"),
-            std::make_pair("\\v-Dhttp.agent=ABC\\fDEF", "-Dhttp.agent=ABC\fDEF"),
-            std::make_pair("\\v-Dhttp.agent=ABC\\vDEF", "-Dhttp.agent=ABC\vDEF"),
-            std::make_pair("\\v-Dhttp.agent=\"ABC\\tDEF\"", "-Dhttp.agent=\"ABC\tDEF\"")
-        };
-
-INSTANTIATE_TEST_SUITE_P(
-    JavaContainer,
-    JavaContainerEscapeSequenceTest,
-    ::testing::ValuesIn(escape_sequences)
-);
-
-TEST(JavaContainer, import_script_with_escaped_options) {
-    const std::string script_code =
-        "%import other_script;\n\n"
-        "%jvmoption -Dsomeoption=\"ABC\";\n\n"
-        "%scriptclass com.exasol.udf_profiling.UdfProfiler;\n"
-        "%jar javacontainer/test/test.jar;"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "	ctx.emit(\"Success!\");\n"
-        " }\n"
-        "}\n";
-    std::unique_ptr<SwigFactoryTestImpl> swigFactory = std::make_unique<SwigFactoryTestImpl>();
-
-    const std::string other_script_code =
-        "%jvmoption -Dsomeotheroption=\"DE\\nF\";\n\n"
-        "%jar javacontainer/test/other_test.jar;"
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n";
-    swigFactory->addModule("other_script", other_script_code);
-    JavaVMTest vm(script_code, std::move(swigFactory));
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    const std::string expected_script_code =
-        "package com.exasol;\r\n\n\n"
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n\n\n\n\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "\tctx.emit(\"Success!\");\n"
-         " }\n}\n";
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/other_test.jar:javacontainer/test/test.jar");
-    EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation);
-    const std::vector<std::string> expectedJVMOptions = {    "-Dexasol.scriptclass=com.exasol.udf_profiling.UdfProfiler",
-                                                             "-Dsomeotheroption=\"DE\nF\"", "-Dsomeoption=\"ABC\"", "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/other_test.jar:javacontainer/test/test.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions);
-}
-
-TEST(JavaContainer, basic_jar_with_trailing_escape) {
-    const std::string script_code = "%scriptclass com.exasol.udf_profiling.UdfProfiler;\n"
-                                    "%jar javacontainer/test/test.jar\\t\t;";
-    EXPECT_THROW({
-        try
-        {
-            JavaVMTest vm(script_code);
-        }
-        catch( const SWIGVMContainers::JavaVMach::exception& e )
-        {
-            EXPECT_THAT( e.what(), MatchesRegex("^.*Java VM cannot find 'javacontainer/test/test\\.jar\t': No such file or directory$"));
-            throw;
-        }
-    }, SWIGVMContainers::JavaVMach::exception );
-}
diff --git a/exaudfclient/base/javacontainer/test/cpp/javacontainer_perf_test.cc b/exaudfclient/base/javacontainer/test/cpp/javacontainer_perf_test.cc
deleted file mode 100644
index b116241..0000000
--- a/exaudfclient/base/javacontainer/test/cpp/javacontainer_perf_test.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "include/gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "javacontainer/test/cpp/javavm_test.h"
-#include "javacontainer/test/cpp/swig_factory_test.h"
-#include <string.h>
-
-const uint32_t NumInlineJavaLines = 500000;
-const uint32_t NumInlineJavaWordsPerLine = 100;
-
-
-TEST(JavaContainerPerformance, large_inline_java_udf_test) {
-    std::string script_code =
-        "%jvmoption option1=abc;\n"
-        "%jvmoption option2=def;\n"
-        "class JVMOPTION_TEST_WITH_SPACE {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n";
-
-    for (uint32_t idxLine(0); idxLine < NumInlineJavaLines; ++idxLine) {
-        for (uint32_t idxWord(0); idxWord < NumInlineJavaWordsPerLine; ++idxWord)
-            script_code.append("somecode ");
-        script_code.append("\n");
-    }
-    script_code.append(" }\n}\n");
-    JavaVMTest vm(script_code);
-}
-
-TEST(JavaContainerPerformance, large_inline_single_line_full_java_udf_test) {
-    std::string script_code =
-        "%jvmoption option1=abc;"
-        "%jvmoption option2=def;"
-        "class JVMOPTION_TEST_WITH_SPACE {"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {";
-
-    for (uint32_t idxLine(0); idxLine < NumInlineJavaLines; ++idxLine) {
-        for (uint32_t idxWord(0); idxWord < NumInlineJavaWordsPerLine; ++idxWord)
-            script_code.append("somecode ");
-
-    }
-    script_code.append(" }}");
-    JavaVMTest vm(script_code);
-}
-
-TEST(JavaContainerPerformance, large_inline_single_line_slim_java_udf_test) {
-    std::string script_code =
-        "%jvmoption option1=abc;"
-        "%jvmoption option2=def;"
-        "class JVMOPTION_TEST_WITH_SPACE {"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {";
-
-    for (uint32_t idxLine(0); idxLine < NumInlineJavaLines / 10; ++idxLine) {
-        for (uint32_t idxWord(0); idxWord < NumInlineJavaWordsPerLine / 10; ++idxWord)
-            script_code.append("someco%de ; \\t");
-
-    }
-    script_code.append(" }}");
-    JavaVMTest vm(script_code);
-}
-
diff --git a/exaudfclient/base/javacontainer/test/cpp/javacontainer_test.cc b/exaudfclient/base/javacontainer/test/cpp/javacontainer_test.cc
deleted file mode 100644
index aad470e..0000000
--- a/exaudfclient/base/javacontainer/test/cpp/javacontainer_test.cc
+++ /dev/null
@@ -1,609 +0,0 @@
-
-#include "include/gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "javacontainer/test/cpp/javavm_test.h"
-#include "javacontainer/javacontainer.h"
-#include "javacontainer/test/cpp/swig_factory_test.h"
-#include <string.h>
-
-using ::testing::MatchesRegex;
-
-
-TEST(JavaContainer, basic_jar) {
-    const std::string script_code = "%scriptclass com.exasol.udf_profiling.UdfProfiler;\n"
-                                    "%jar javacontainer/test/test.jar;";
-    JavaVMTest vm(script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, "\n");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/test.jar");
-    EXPECT_FALSE(vm.getJavaVMInternalStatus().m_needsCompilation);
-    const std::vector<std::string> expectedJVMOptions = { "-Dexasol.scriptclass=com.exasol.udf_profiling.UdfProfiler",
-                                                            "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/test.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions);
-}
-
-TEST(JavaContainer, basic_jar_script_class_with_white_spaces) {
-    const std::string script_code = "%scriptclass com.exasol.udf_profiling.UdfProfiler\t    ;\n"
-                                    "%jar javacontainer/test/test.jar;";
-    JavaVMTest vm(script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, "\n");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/test.jar");
-    EXPECT_FALSE(vm.getJavaVMInternalStatus().m_needsCompilation);
-    const std::vector<std::string> expectedJVMOptions = { "-Dexasol.scriptclass=com.exasol.udf_profiling.UdfProfiler",
-                                                            "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/test.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions);
-}
-
-
-TEST(JavaContainer, basic_jar_with_white_spaces) {
-    const std::string script_code = "%jar javacontainer/test/test.jar \t ;";
-
-    JavaVMTest vm(script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/test.jar");
-}
-
-TEST(JavaContainer, basic_jars_ordering) {
-    /*
-     * This test validates correct behavior of collecting the %jar options in Extractor V1/V2.
-     * Both jar files referenced in `script_code` do not exist.
-     * The JavaVM will throw an exception with the first JAR file it gets from Extractor.
-     * For extractor V1: Our assumption is that the exception will be for `base/javacontainer/test/abc.jar`
-     * as this is alphabetically the first JAR file. (re-ordering)
-     * For extractor V2: Our assumption is that the exception will be for `base/javacontainer/test/test1.jar`
-     * as this is the first JAR file. (no re-ordering)
-     */
-    const std::string script_code = "%jar javacontainer/test/test1.jar:javacontainer/test/abc.jar;";
-
-#ifndef USE_EXTRACTOR_V2
-    const char* regexExpectedException = "^.*Java VM cannot find 'javacontainer/test/abc\\.jar': No such file or directory$";
-#else
-    const char* regexExpectedException = "^.*Java VM cannot find 'javacontainer/test/test1\\.jar': No such file or directory$";
-#endif
-    EXPECT_THROW({
-        try
-        {
-            JavaVMTest vm(script_code);
-        }
-        catch( const SWIGVMContainers::JavaVMach::exception& e )
-        {
-            EXPECT_THAT( e.what(), MatchesRegex(regexExpectedException));
-            throw;
-        }
-    }, SWIGVMContainers::JavaVMach::exception );
-}
-
-TEST(JavaContainer, basic_inline) {
-    const std::string script_code = "import java.time.LocalDateTime;"
-                                    "import java.time.ZoneOffset;"
-                                    "import java.time.format.DateTimeFormatter;"
-                                    "class SIMPLE {"
-                                    "static void main(String[] args) {"
-                                    "int i = 0;"
-                                    "}"
-                                    "static int run(ExaMetadata exa, ExaIterator ctx) {"
-                                    "return 0;"
-                                    "}"
-                                    "}";
-    JavaVMTest vm(script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    const std::string expected_script_code = std::string("package com.exasol;\r\n") + script_code;
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation);
-    const std::vector<std::string> expectedJVMOptions = {   "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions);
-}
-
-
-
-TEST(JavaContainer, combined_inline_jar) {
-    const std::string script_code = "import java.time.LocalDateTime;"
-                                    "import java.time.ZoneOffset;"
-                                    "import java.time.format.DateTimeFormatter;"
-                                    "class SIMPLE {"
-                                    "static void main(String[] args) {"
-                                    "int i = 0;"
-                                    "}"
-                                    "static int run(ExaMetadata exa, ExaIterator ctx) {"
-                                    "return 0;"
-                                    "}"
-                                    "}";
-    const std::string script_code_with_jar = std::string("%jar javacontainer/test/test.jar;") + script_code;
-    JavaVMTest vm(script_code_with_jar);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    const std::string expected_script_code = std::string("package com.exasol;\r\n") + script_code;
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/test.jar");
-    EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation);
-    const std::vector<std::string> expectedJVMOptions = {   "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/test.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions);
-}
-
-
-TEST(JavaContainer, quoted_jvm_option) {
-    const std::string script_code =
-        "%jvmoption -Dhttp.agent=\"ABC DEF\";\n\n"
-        "class JVMOPTION_TEST_WITH_SPACE {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "	ctx.emit(\"Success!\");\n"
-        " }\n"
-        "}\n";
-    JavaVMTest vm(script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    const std::string expected_script_code =
-        "package com.exasol;\r\n\n\n"
-        "class JVMOPTION_TEST_WITH_SPACE {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "\tctx.emit(\"Success!\");\n"
-         " }\n}\n";
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation);
-    /*
-     * Note: The option "DEF" is wrong and causes UDF's to crash!
-     *       The correct option would be '-Dhttp.agent=\"ABC DEF\"'
-     */
-    const std::vector<std::string> expectedJVMOptions = {   "-Dhttp.agent=\"ABC", "DEF\"", "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions);
-}
-
-TEST(JavaContainer, simple_import_script) {
-    const std::string script_code =
-        "%import other_script;\n\n"
-        "%jvmoption -Dhttp.agent=\"ABC\";\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "	ctx.emit(\"Success!\");\n"
-        " }\n"
-        "}\n";
-    auto swigFactory = std::make_unique<SwigFactoryTestImpl>();
-
-    const std::string other_script_code =
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n";
-    swigFactory->addModule("other_script", other_script_code);
-    JavaVMTest vm(script_code, std::move(swigFactory));
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    const std::string expected_script_code =
-        "package com.exasol;\r\n"
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n\n\n\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "\tctx.emit(\"Success!\");\n"
-         " }\n}\n";
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation);
-    const std::vector<std::string> expectedJVMOptions = {   "-Dhttp.agent=\"ABC\"", "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions);
-}
-
-TEST(JavaContainer, simple_import_script_with_white_space) {
-    const std::string script_code =
-        "%import other_script\t ;\n\n"
-        "%jvmoption -Dhttp.agent=\"ABC\";\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "	ctx.emit(\"Success!\");\n"
-        " }\n"
-        "}\n";
-    auto swigFactory = std::make_unique<SwigFactoryTestImpl>();
-
-    const std::string other_script_code =
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n";
-    swigFactory->addModule("other_script", other_script_code);
-    JavaVMTest vm(script_code, std::move(swigFactory));
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    const std::string expected_script_code =
-        "package com.exasol;\r\n"
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n\n\n\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "\tctx.emit(\"Success!\");\n"
-         " }\n}\n";
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation);
-    const std::vector<std::string> expectedJVMOptions = {   "-Dhttp.agent=\"ABC\"", "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions);
-}
-
-TEST(JavaContainer, simple_import_script_with_quotes) {
-    const std::string script_code =
-        "%import \"other_script\t \";\n\n"
-        "%jvmoption -Dhttp.agent=\"ABC\";\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "	ctx.emit(\"Success!\");\n"
-        " }\n"
-        "}\n";
-    auto swigFactory = std::make_unique<SwigFactoryTestImpl>();
-
-    const std::string other_script_code =
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n";
-    swigFactory->addModule("\"other_script\t \"", other_script_code);
-    JavaVMTest vm(script_code, std::move(swigFactory));
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    const std::string expected_script_code =
-        "package com.exasol;\r\n"
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n\n\n\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "\tctx.emit(\"Success!\");\n"
-         " }\n}\n";
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation);
-    const std::vector<std::string> expectedJVMOptions = {   "-Dhttp.agent=\"ABC\"", "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions);
-}
-
-TEST(JavaContainer, import_script_with_recursion) {
-    const std::string script_code =
-        "%import other_script;\n\n"
-        "%jvmoption -Dhttp.agent=\"ABC\";\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "	ctx.emit(\"Success!\");\n"
-        " }\n"
-        "}\n";
-    auto swigFactory = std::make_unique<SwigFactoryTestImpl>();
-
-    const std::string other_script_code =
-        "%import other_script;\n\n"
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n";
-    swigFactory->addModule("other_script", other_script_code);
-    JavaVMTest vm(script_code, std::move(swigFactory));
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    const std::string expected_script_code =
-        "package com.exasol;\r\n\n\n"
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n\n\n\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "\tctx.emit(\"Success!\");\n"
-         " }\n}\n";
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation);
-    const std::vector<std::string> expectedJVMOptions = {   "-Dhttp.agent=\"ABC\"", "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions);
-}
-
-TEST(JavaContainer, import_script_with_jvmoption) {
-    const std::string script_code =
-        "%import other_script;\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "	ctx.emit(\"Success!\");\n"
-        " }\n"
-        "}\n";
-    auto swigFactory = std::make_unique<SwigFactoryTestImpl>();
-
-    const std::string other_script_code =
-        "%jvmoption -Dhttp.agent=\"ABC\";\n\n"
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n";
-    swigFactory->addModule("other_script", other_script_code);
-    JavaVMTest vm(script_code, std::move(swigFactory));
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    const std::string expected_script_code =
-        "package com.exasol;\r\n\n\n"
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "\tctx.emit(\"Success!\");\n"
-         " }\n}\n";
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation);
-    const std::vector<std::string> expectedJVMOptions = {   "-Dhttp.agent=\"ABC\"", "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions);
-}
-
-TEST(JavaContainer, multiple_import_scripts) {
-    const std::string script_code =
-        "%import other_script_A;\n\n"
-        "%import other_script_C;\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "	ctx.emit(\"Success!\");\n"
-        " }\n"
-        "}\n";
-    auto swigFactory = std::make_unique<SwigFactoryTestImpl>();
-
-    const std::string other_scipt_code_A =
-        "%import other_script_B;\n\n"
-        "class OtherClassA {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n";
-    const std::string other_scipt_code_B =
-        "class OtherClassB {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n";
-    const std::string other_scipt_code_C =
-        "%import other_script_B;\n\n"
-        "class OtherClassC {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n";
-    swigFactory->addModule("other_script_A", other_scipt_code_A);
-    swigFactory->addModule("other_script_B", other_scipt_code_B);
-    swigFactory->addModule("other_script_C", other_scipt_code_C);
-    JavaVMTest vm(script_code, std::move(swigFactory));
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    const std::string expected_script_code =
-        "package com.exasol;\r\n"
-        "class OtherClassB {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n\n\n"
-        "class OtherClassA {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n\n\n\n\n"
-        "class OtherClassC {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "\tctx.emit(\"Success!\");\n"
-         " }\n}\n";
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation);
-    const std::vector<std::string> expectedJVMOptions = {   "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions);
-}
-
-TEST(JavaContainer, import_script_with_mixed_options) {
-    const std::string script_code =
-        "%import other_script;\n\n"
-        "%jvmoption -Dsomeoption=\"ABC\";\n\n"
-        "%scriptclass com.exasol.udf_profiling.UdfProfiler;\n"
-        "%jar javacontainer/test/test.jar;"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "	ctx.emit(\"Success!\");\n"
-        " }\n"
-        "}\n";
-    auto swigFactory = std::make_unique<SwigFactoryTestImpl>();
-
-    const std::string other_script_code =
-        "%jvmoption -Dsomeotheroption=\"DEF\";\n\n"
-        "%jar javacontainer/test/other_test.jar;"
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n";
-    swigFactory->addModule("other_script", other_script_code);
-    JavaVMTest vm(script_code, std::move(swigFactory));
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    const std::string expected_script_code =
-        "package com.exasol;\r\n\n\n"
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n\n\n\n\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "\tctx.emit(\"Success!\");\n"
-         " }\n}\n";
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/other_test.jar:javacontainer/test/test.jar");
-    EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation);
-    const std::vector<std::string> expectedJVMOptions = {    "-Dexasol.scriptclass=com.exasol.udf_profiling.UdfProfiler",
-                                                             "-Dsomeotheroption=\"DEF\"", "-Dsomeoption=\"ABC\"", "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar:javacontainer/test/other_test.jar:javacontainer/test/test.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions);
-}
-
-TEST(JavaContainer, import_script_script_class_option_ignored) {
-    const std::string script_code =
-        "%import other_script;\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "	ctx.emit(\"Success!\");\n"
-        " }\n"
-        "}\n";
-    auto swigFactory = std::make_unique<SwigFactoryTestImpl>();
-
-    const std::string other_script_code =
-        "%scriptclass com.exasol.udf_profiling.UdfProfiler;\n"
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n";
-    swigFactory->addModule("other_script", other_script_code);
-    JavaVMTest vm(script_code, std::move(swigFactory));
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    const std::string expected_script_code =
-        "package com.exasol;\r\n"
-#ifndef USE_EXTRACTOR_V2 //The parsers behave differently: The legacy parser incorrectly keeps imported scriptclass options
-        "%scriptclass com.exasol.udf_profiling.UdfProfiler;"
-#endif
-        "\n"
-        "class OtherClass {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "\tctx.emit(\"Success!\");\n"
-         " }\n}\n";
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation);
-    const std::vector<std::string> expectedJVMOptions = {    "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions);
-}
-
-
-TEST(JavaContainer, import_scripts_deep_recursion) {
-    const std::string script_code =
-        "%import other_script_A;\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "	ctx.emit(\"Success!\");\n"
-        " }\n"
-        "}\n";
-    auto swigFactory = std::make_unique<SwigFactoryTestImpl>();
-
-    const std::string other_scipt_code_A =
-        "%import other_script_B;\n\n"
-        "class OtherClassA {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n";
-    const std::string other_scipt_code_B =
-        "%import other_script_C;\n\n"
-        "class OtherClassB {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n";
-    const std::string other_scipt_code_C =
-        "%import other_script_D;\n\n"
-        "class OtherClassC {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n";
-    const std::string other_scipt_code_D =
-        "%import other_script_A;\n\n"
-        "class OtherClassD {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n";
-    swigFactory->addModule("other_script_A", other_scipt_code_A);
-    swigFactory->addModule("other_script_B", other_scipt_code_B);
-    swigFactory->addModule("other_script_C", other_scipt_code_C);
-    swigFactory->addModule("other_script_D", other_scipt_code_D);
-    JavaVMTest vm(script_code, std::move(swigFactory));
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJavaPath, "/exaudf/external/exaudfclient_base+/javacontainer");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_localClasspath, "/tmp");
-    const std::string expected_script_code =
-        "package com.exasol;\r\n\n\n"
-        "class OtherClassD {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n\n\n"
-        "class OtherClassC {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n\n\n"
-        "class OtherClassB {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n\n\n"
-        "class OtherClassA {\n"
-        "static void doSomething() {\n\n"
-        " }\n"
-        "}\n\n\n"
-        "class JVMOPTION_TEST {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "\tctx.emit(\"Success!\");\n"
-         " }\n}\n";
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_scriptCode, expected_script_code);
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_exaJarPath, "/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_classpath, "/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar");
-    EXPECT_TRUE(vm.getJavaVMInternalStatus().m_needsCompilation);
-    const std::vector<std::string> expectedJVMOptions = {   "-Xms128m", "-Xmx128m", "-Xss512k",
-                                                            "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
-                                                            "-Djava.class.path=/tmp:/exaudf/external/exaudfclient_base+/javacontainer/exaudf_deploy.jar",
-                                                            "-XX:+UseSerialGC" };
-    EXPECT_EQ(vm.getJavaVMInternalStatus().m_jvmOptions, expectedJVMOptions);
-}
diff --git a/exaudfclient/base/javacontainer/test/cpp/javavm_test.cc b/exaudfclient/base/javacontainer/test/cpp/javavm_test.cc
deleted file mode 100644
index fe73a89..0000000
--- a/exaudfclient/base/javacontainer/test/cpp/javavm_test.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "javacontainer/test/cpp/javavm_test.h"
-#include "javacontainer/test/cpp/swig_factory_test.h"
-#include "javacontainer/javacontainer_impl.h"
-#include "javacontainer/script_options/extractor_impl.h"
-#include <string.h>
-
-std::unique_ptr<SwigFactoryTestImpl> makeDefaultSwigFactory() {
-    return std::make_unique<SwigFactoryTestImpl>();
-}
-
-JavaVMTest::JavaVMTest(std::string scriptCode) : javaVMInternalStatus() {
-    run(scriptCode, std::move(makeDefaultSwigFactory()));
-}
-
-JavaVMTest::JavaVMTest(std::string scriptCode, std::unique_ptr<SwigFactoryTestImpl> swigFactory) : javaVMInternalStatus() {
-    run(scriptCode, std::move(swigFactory));
-}
-
-void JavaVMTest::run(std::string scriptCode, std::unique_ptr<SwigFactoryTestImpl> swigFactory) {
-    SWIGVMContainers::SWIGVM_params->script_code = scriptCode.data();
-#ifndef USE_EXTRACTOR_V2
-    std::unique_ptr<SWIGVMContainers::JavaScriptOptions::tExtractorLegacy> extractor =
-         std::make_unique<SWIGVMContainers::JavaScriptOptions::tExtractorLegacy>(std::move(swigFactory));
-#else
-    std::unique_ptr<SWIGVMContainers::JavaScriptOptions::tExtractorV2> extractor =
-         std::make_unique<SWIGVMContainers::JavaScriptOptions::tExtractorV2>(std::move(swigFactory));
-#endif
-    SWIGVMContainers::JavaVMImpl javaVMImpl(false, true, std::move(extractor));
-    javaVMInternalStatus.m_exaJavaPath = javaVMImpl.m_exaJavaPath;
-    javaVMInternalStatus.m_localClasspath = javaVMImpl.m_localClasspath;
-    javaVMInternalStatus.m_scriptCode = javaVMImpl.m_scriptCode;
-    javaVMInternalStatus.m_exaJarPath = javaVMImpl.m_exaJarPath;
-    javaVMInternalStatus.m_classpath = javaVMImpl.m_classpath;
-    javaVMInternalStatus.m_jvmOptions = javaVMImpl.m_jvmOptions;
-    javaVMInternalStatus.m_needsCompilation = javaVMImpl.m_needsCompilation;
-}
-
diff --git a/exaudfclient/base/javacontainer/test/cpp/javavm_test.h b/exaudfclient/base/javacontainer/test/cpp/javavm_test.h
deleted file mode 100644
index a0e8e0b..0000000
--- a/exaudfclient/base/javacontainer/test/cpp/javavm_test.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef JAVA_VM_TEST
-#define JAVA_VM_TEST
-
-#include <string>
-#include <set>
-#include <vector>
-#include <memory>
-
-struct JavaVMInternalStatus {
-    std::string m_exaJavaPath;
-    std::string m_localClasspath;
-    std::string m_scriptCode;
-    std::string m_exaJarPath;
-    std::string m_classpath;
-    bool m_needsCompilation;
-    std::vector<std::string> m_jvmOptions;
-};
-
-class SwigFactoryTestImpl;
-
-class JavaVMTest {
-    public:
-        JavaVMTest(std::string scriptCode);
-
-        JavaVMTest(std::string scriptCode, std::unique_ptr<SwigFactoryTestImpl> swigFactory);
-
-        const JavaVMInternalStatus& getJavaVMInternalStatus() {return javaVMInternalStatus;}
-
-    private:
-        void run(std::string scriptCode, std::unique_ptr<SwigFactoryTestImpl> swigFactory);
-    private:
-        JavaVMInternalStatus javaVMInternalStatus;
-};
-
-#endif
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/test/cpp/swig_factory_test.cc b/exaudfclient/base/javacontainer/test/cpp/swig_factory_test.cc
deleted file mode 100644
index 750789f..0000000
--- a/exaudfclient/base/javacontainer/test/cpp/swig_factory_test.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-#include "javacontainer/test/cpp/swig_factory_test.h"
-#include "exaudflib/swig/swig_meta_data.h"
-
-#include <stdexcept>
-
-class NotImplemented : public std::logic_error
-{
-public:
-    NotImplemented() : std::logic_error("Function not yet implemented") { };
-    NotImplemented(const std::string funcName) : std::logic_error("Function " + funcName + " not yet implemented") { };
-};
-
-class SWIGMetadataTest : public SWIGVMContainers::SWIGMetadataIf {
-
-public:
-    SWIGMetadataTest(const std::map<std::string, std::string> & moduleContent, const std::string & exceptionMsg)
-        : m_exceptionMsg(exceptionMsg)
-        , m_moduleContent(moduleContent) {}
-    virtual const char* databaseName() { throw NotImplemented("databaseName"); return nullptr;}
-    virtual const char* databaseVersion() { throw NotImplemented("databaseVersion"); return nullptr;}
-    virtual const char* scriptName() { throw NotImplemented("scriptName"); return nullptr;}
-    virtual const char* scriptSchema() { throw NotImplemented("scriptSchema"); return nullptr;}
-    virtual const char* currentUser() { throw NotImplemented("currentUser"); return nullptr;}
-    virtual const char* scopeUser() { throw NotImplemented("scopeUser"); return nullptr;}
-    virtual const char* currentSchema() { throw NotImplemented("currentSchema"); return nullptr;}
-    virtual const char* scriptCode() { throw NotImplemented("scriptCode"); return nullptr;}
-    virtual const unsigned long long sessionID() { throw NotImplemented("sessionID"); return 0;}
-    virtual const char *sessionID_S() { throw NotImplemented("sessionID_S"); return nullptr;}
-    virtual const unsigned long statementID() { throw NotImplemented("statementID"); return 0;}
-    virtual const unsigned int nodeCount() { throw NotImplemented("nodeCount"); return 0;}
-    virtual const unsigned int nodeID() { throw NotImplemented("nodeID"); return 0;}
-    virtual const unsigned long long vmID() { throw NotImplemented("vmID"); return 0;}
-    virtual const unsigned long long memoryLimit() { throw NotImplemented("memoryLimit"); return 0;}
-    virtual const SWIGVMContainers::VMTYPE vmType() {
-        throw NotImplemented("vmType");
-        return SWIGVMContainers::VM_UNSUPPORTED;
-    }
-    virtual const char *vmID_S() { throw NotImplemented("vmID_S"); return nullptr;}
-    virtual const ExecutionGraph::ConnectionInformationWrapper* connectionInformation(const char* connection_name) {
-        throw NotImplemented("connectionInformation"); return nullptr;
-    }
-    virtual const char* moduleContent(const char* name) {
-        auto it = m_moduleContent.find(std::string(name));
-        if (m_moduleContent.end() == it) {
-            throw std::invalid_argument("Script not found.");
-        }
-        return it->second.c_str();
-    }
-    virtual const unsigned int inputColumnCount() { throw NotImplemented("inputColumnCount"); return 0;}
-    virtual const char *inputColumnName(unsigned int col) {
-        throw NotImplemented("inputColumnName");
-        return nullptr;
-    }
-    virtual const SWIGVMContainers::SWIGVM_datatype_e inputColumnType(unsigned int col) {
-        throw NotImplemented("inputColumnType");
-        return SWIGVMContainers::UNSUPPORTED;
-    }
-    virtual const char *inputColumnTypeName(unsigned int col) {
-        throw NotImplemented("inputColumnTypeName"); return nullptr;
-    }
-    virtual const unsigned int inputColumnSize(unsigned int col) {
-        throw NotImplemented("inputColumnSize"); return 0;
-    }
-    virtual const unsigned int inputColumnPrecision(unsigned int col) {
-        throw NotImplemented("inputColumnPrecision"); return 0;
-    }
-    virtual const unsigned int inputColumnScale(unsigned int col) {
-        throw NotImplemented("inputColumnScale"); return 0;
-    }
-    virtual const SWIGVMContainers::SWIGVM_itertype_e inputType() {
-        throw NotImplemented("inputType");
-        return SWIGVMContainers::EXACTLY_ONCE;
-    }
-    virtual const unsigned int outputColumnCount() { throw NotImplemented("outputColumnCount"); return 0;}
-    virtual const char *outputColumnName(unsigned int col) { throw NotImplemented("outputColumnName"); return nullptr;}
-    virtual const SWIGVMContainers::SWIGVM_datatype_e outputColumnType(unsigned int col) {
-        throw NotImplemented("outputColumnType");
-        return SWIGVMContainers::UNSUPPORTED;
-    }
-    virtual const char *outputColumnTypeName(unsigned int col) {
-        throw NotImplemented("outputColumnTypeName"); return nullptr;
-    }
-    virtual const unsigned int outputColumnSize(unsigned int col) {
-        throw NotImplemented("outputColumnSize"); return 0;
-    }
-    virtual const unsigned int outputColumnPrecision(unsigned int col) {
-        throw NotImplemented("outputColumnPrecision"); return 0;
-    }
-    virtual const unsigned int outputColumnScale(unsigned int col) {
-        throw NotImplemented("outputColumnScale"); return 0;
-    }
-    virtual const SWIGVMContainers::SWIGVM_itertype_e outputType() {
-        throw NotImplemented("outputType");
-        return SWIGVMContainers::EXACTLY_ONCE;
-    }
-    virtual const bool isEmittedColumn(unsigned int col) { throw NotImplemented("isEmittedColumn"); return false;}
-    virtual const char* checkException() {
-        if (m_exceptionMsg.empty()) {
-            return nullptr;
-        }
-        return m_exceptionMsg.c_str();
-    }
-    virtual const char* pluginLanguageName() { throw NotImplemented("pluginLanguageName"); return nullptr;}
-    virtual const char* pluginURI() { throw NotImplemented("pluginURI"); return nullptr;}
-    virtual const char* outputAddress() { throw NotImplemented("outputAddress"); return nullptr;}
-
-private:
-    std::string m_exceptionMsg;
-
-    std::map<std::string, std::string> m_moduleContent;
-};
-
-
-
-SwigFactoryTestImpl::SwigFactoryTestImpl() {}
-
-
-void SwigFactoryTestImpl::addModule(const std::string key, const std::string script) {
-    m_moduleContent.insert(std::make_pair(key, script));
-}
-
-void SwigFactoryTestImpl::setException(const std::string msg) {
-    m_exceptionMsg = msg;
-}
-
-SWIGVMContainers::SWIGMetadataIf* SwigFactoryTestImpl::makeSwigMetadata() {
-    return new SWIGMetadataTest(m_moduleContent, m_exceptionMsg);
-}
diff --git a/exaudfclient/base/javacontainer/test/cpp/swig_factory_test.h b/exaudfclient/base/javacontainer/test/cpp/swig_factory_test.h
deleted file mode 100644
index fedd1a4..0000000
--- a/exaudfclient/base/javacontainer/test/cpp/swig_factory_test.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef SWIG_FACTORY_TEST_H
-#define SWIG_FACTORY_TEST_H 1
-
-#include <string>
-#include <map>
-#include "swig_factory/swig_factory.h"
-
-struct SwigFactoryTestImpl : public SWIGVMContainers::SwigFactory {
-
-    SwigFactoryTestImpl();
-
-    void addModule(const std::string key, const std::string script);
-
-    void setException(const std::string msg);
-
-    virtual SWIGVMContainers::SWIGMetadataIf* makeSwigMetadata() override;
-
-private:
-    std::map<std::string, std::string> m_moduleContent;
-    std::string m_exceptionMsg;
-};
-
-
-#endif //namespace SWIG_FACTORY_TEST_H
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/test/java/com/exasol/ExaStackTraceCleanerTest.java b/exaudfclient/base/javacontainer/test/java/com/exasol/ExaStackTraceCleanerTest.java
deleted file mode 100644
index d522aca..0000000
--- a/exaudfclient/base/javacontainer/test/java/com/exasol/ExaStackTraceCleanerTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.exasol;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import com.exasol.ExaStackTraceCleaner;
-import java.lang.Exception;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.CoreMatchers.containsString;
-
-//First build some artificial exception chain
-
-final class CustomTestException extends Exception {
-    public CustomTestException(final String msg, final Throwable th) {
-        super(msg, th);
-    }
-}
-
-
-final class CustomTestClass {
-    public CustomTestClass() {}
-
-    public void throwEx() throws CustomTestException {
-        try {
-            try {
-                throw new RuntimeException("ex1");
-            } catch (final RuntimeException ex) {
-                throw new RuntimeException("ex2", ex);
-            }
-        } catch(final  RuntimeException ex) {
-            throw new CustomTestException("ex3", ex);
-        }
-    }
-}
-
-class ExaWrapper {
-    public static void wrap_custom_test_class() throws ClassNotFoundException, NoSuchMethodException,
-                                                    InstantiationException, IllegalAccessException,
-                                                    InvocationTargetException {
-        Class a = Class.forName("com.exasol.CustomTestClass");
-        Constructor<?> constructor = a.getConstructor();
-        Object obj = constructor.newInstance();
-        Method m = a.getMethod("throwEx");
-        m.invoke(obj);
-    }
-}
-
-public class ExaStackTraceCleanerTest {
-
-
-    @Test
-    public void runSimpleTest() {
-        Throwable th = null;
-        try {
-            ExaWrapper.wrap_custom_test_class();
-        } catch(final Exception ex) {
-           th = ex;
-        }
-        ExaStackTraceCleaner exaStackTraceCleaner = new ExaStackTraceCleaner(ExaWrapper.class.getName());
-        final String result = exaStackTraceCleaner.cleanStackTrace(th);
-        String[] resultLines = result.split("\n");
-        //Check that the
-        assertTrue(resultLines.length > 4);
-        assertEquals(resultLines[0], "com.exasol.CustomTestException: ex3");
-        assertThat(resultLines[1], containsString("com.exasol.CustomTestClass.throwEx(ExaStackTraceCleanerTest.java"));
-        assertThat(resultLines[2], containsString("com.exasol.ExaWrapper.wrap_custom_test_class(ExaStackTraceCleanerTest.java:47)"));
-        assertThat(resultLines[3], containsString("com.exasol.ExaStackTraceCleanerTest.runSimpleTest(ExaStackTraceCleanerTest.java"));
-    }
-
-}
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/test/other_test.jar b/exaudfclient/base/javacontainer/test/other_test.jar
deleted file mode 100644
index e69de29..0000000
diff --git a/exaudfclient/base/javacontainer/test/test.jar b/exaudfclient/base/javacontainer/test/test.jar
deleted file mode 100644
index e69de29..0000000
diff --git a/exaudfclient/base/script_options_parser/ctpg/test/BUILD b/exaudfclient/base/script_options_parser/ctpg/test/BUILD
deleted file mode 100644
index a84e060..0000000
--- a/exaudfclient/base/script_options_parser/ctpg/test/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-cc_test(
-    name = "script-options-ctpg-parser-test",
-    srcs = ["script_option_lines_test.cpp"],
-    deps = [
-        "//script_options_parser/ctpg:script_option_lines_parser_ctpg",
-        "@googletest//:gtest_main",
-    ],
-)
\ No newline at end of file
diff --git a/exaudfclient/base/script_options_parser/ctpg/test/script_option_lines_test.cpp b/exaudfclient/base/script_options_parser/ctpg/test/script_option_lines_test.cpp
deleted file mode 100644
index bcc4c98..0000000
--- a/exaudfclient/base/script_options_parser/ctpg/test/script_option_lines_test.cpp
+++ /dev/null
@@ -1,337 +0,0 @@
-#include "script_options_parser/ctpg/script_option_lines_ctpg.h"
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-#include <string>
-#include <exception>
-#include "script_options_parser/exception.h"
-
-
-using namespace ExecutionGraph;
-using namespace ExecutionGraph::OptionsLineParser::CTPG;
-
-using ::testing::MatchesRegex;
-
-
-inline ScriptOption buildOption(const char* value, size_t idx, size_t len) {
-    ScriptOption option = { .value = value, .idx_in_source = idx, .size = len};
-    return option;
-}
-
-#ifndef VALGRIND_ACTIVE
-
-class ScriptOptionLinesWhitespaceTest : public ::testing::TestWithParam<std::tuple<std::string, std::string, std::string, std::string, std::string, std::string, std::string>> {};
-
-TEST_P(ScriptOptionLinesWhitespaceTest, WhitespaceExtractOptionLineTest) {
-    const std::string prefix = std::get<0>(GetParam());
-    const std::string suffix = std::get<1>(GetParam());
-    const std::string new_line = std::get<2>(GetParam());
-    const std::string option = std::get<3>(GetParam());
-    const std::string delimeter = std::get<4>(GetParam());
-    const std::string value = std::get<5>(GetParam());
-    const std::string payload =  std::get<6>(GetParam());
-    const std::string code = prefix + '%' + option + delimeter + value + ';' + suffix + new_line + payload;
-    options_map_t result;
-    parseOptions(code, result);
-    ASSERT_EQ(result.size(), 1);
-    const auto option_result = result.find(option);
-    ASSERT_NE(option_result, result.end());
-    ASSERT_EQ(option_result->second.size(), 1);
-    EXPECT_EQ(option_result->second[0].value, value);
-}
-
-std::vector<std::string> prefixes = {"", " ", "\t", "\f", "\v", "\n", "\r\n", " \t", "\t ", "\t\f", "\f\t", "\f ", " \f", "\t\v", "\v\t", "\v ", " \v", "\f\v", "\v\f", "  \t", " \t "}; //"" for case if there is prefix
-std::vector<std::string> suffixes = {"", " ", "\t", "\f", "\v"}; //"" for case if there is suffix
-std::vector<std::string> new_lines = {"", "\n", "\r", "\r\n"}; //"" for case if there is no newline
-std::vector<std::string> delimeters = {" ", "\t", "\f", "\v", " \t", "\t ", "\t\f", "\f\t", "\f ", " \f", "\t\v", "\v\t", "\v ", " \v", "\f\v", "\v\f", "  \t", " \t "};
-std::vector<std::string> keywords = {"import", "jvmoption", "scriptclass", "jar", "env"};
-std::vector<std::string> values = {"something", "com.mycompany.MyScriptClass", "LD_LIBRARY_PATH=/nvdriver", "-Xms128m -Xmx1024m -Xss512k", "/buckets/bfsdefault/default/my_code.jar", "something "};
-std::vector<std::string> payloads = {"anything", "\n\ndef my_func:\n\tpass", "class MyJava\n public static void Main() {\n};\n"};
-
-INSTANTIATE_TEST_SUITE_P(
-    ScriptOptionLines,
-    ScriptOptionLinesWhitespaceTest,
-    ::testing::Combine(::testing::ValuesIn(prefixes),
-                       ::testing::ValuesIn(suffixes),
-                       ::testing::ValuesIn(new_lines),
-                       ::testing::ValuesIn(keywords),
-                       ::testing::ValuesIn(delimeters),
-                       ::testing::ValuesIn(values),
-                       ::testing::ValuesIn(payloads)
-    )
-);
-
-#endif //VALGRIND_ACTIVE
-
-TEST(ScriptOptionLinesTest, ignore_anything_other_than_whitepsace) {
-    const std::string code =
-        "abc %option myoption;\n"
-        "\nmycode";
-    options_map_t result;
-    parseOptions(code, result);
-    EXPECT_TRUE(result.empty());
-}
-
-TEST(ScriptOptionLinesTest, need_option_termination_character) {
-    const std::string code =
-        "%option myoption\n"
-        "\nmycode";
-    options_map_t result;
-    EXPECT_THROW({
-        try
-        {
-            parseOptions(code, result);
-        }
-        catch( const OptionParserException& e )
-        {
-            // and this tests that it has the correct message
-            EXPECT_STREQ( e.what(), "Error parsing script options at line 0: [1:17] PARSE: Syntax error: Unexpected '<eof>'\n");
-            throw;
-        }
-    }, OptionParserException );
-}
-
-TEST(ScriptOptionLinesTest, need_option_termination_character_second_line) {
-    const std::string code =
-        "%optionA myoption;\n"
-        "%optionB myoption\n"
-        "\nmycode";
-    options_map_t result;
-    EXPECT_THROW({
-        try
-        {
-            parseOptions(code, result);
-        }
-        catch( const OptionParserException& e )
-        {
-            // and this tests that it has the correct message
-            EXPECT_STREQ( e.what(), "Error parsing script options at line 1: [1:18] PARSE: Syntax error: Unexpected '<eof>'\n");
-            throw;
-        }
-    }, OptionParserException );
-}
-
-TEST(ScriptOptionLinesTest, finds_the_two_options_same_key) {
-    const std::string code =
-        "%some_option myoption; %some_option mysecondoption;\n"
-        "\nmycode";
-    options_map_t result;
-    parseOptions(code, result);
-    ASSERT_EQ(result.size(), 1);
-    const auto option_result = result.find("some_option");
-
-    ASSERT_NE(option_result, result.end());
-    ASSERT_EQ(option_result->second.size(), 2);
-    ASSERT_EQ(option_result->second[0], buildOption("myoption", 0, 22));
-    ASSERT_EQ(option_result->second[1], buildOption("mysecondoption", 23, 28));
-}
-
-TEST(ScriptOptionLinesTest, finds_the_two_options_different_keys) {
-    const std::string code =
-        "%some_option myoption; %otheroption mysecondoption;\n"
-        "\nmycode";
-    options_map_t result;
-    parseOptions(code, result);
-    ASSERT_EQ(result.size(), 2);
-    const auto option_result = result.find("some_option");
-
-    ASSERT_NE(option_result, result.end());
-    ASSERT_EQ(option_result->second.size(), 1);
-    ASSERT_EQ(option_result->second[0], buildOption("myoption", 0, 22));
-
-    const auto otheroption_result = result.find("otheroption");
-
-    ASSERT_NE(otheroption_result, result.end());
-    ASSERT_EQ(otheroption_result->second.size(), 1);
-    ASSERT_EQ(otheroption_result->second[0], buildOption("mysecondoption", 23, 28));
-}
-
-class ScriptOptionLinesInvalidOptionTest : public ::testing::TestWithParam<std::string> {};
-
-
-TEST_P(ScriptOptionLinesInvalidOptionTest, value_is_mandatory) {
-    const std::string invalid_option = GetParam();
-    const std::string code = invalid_option + "\nsomething";
-    options_map_t result;
-    EXPECT_THROW({
-        try
-        {
-            parseOptions(code, result);
-        }
-        catch( const OptionParserException& e )
-        {
-            EXPECT_THAT( e.what(), MatchesRegex("^Error parsing script options.*PARSE: Syntax error: Unexpected.*$"));
-            throw;
-        }
-    }, OptionParserException );
-}
-
-const std::vector<std::string> invalid_options = {"%some_option ;", "%some_option \n", "\n%some_option\n;", "%some_option\nvalue;"};
-
-INSTANTIATE_TEST_SUITE_P(
-    ScriptOptionLines,
-    ScriptOptionLinesInvalidOptionTest,
-    ::testing::ValuesIn(invalid_options)
-);
-
-
-TEST(ScriptOptionLinesTest, test_when_two_options_plus_code_in_same_line_then_options_parsed_successfully) {
-    /**
-    Verify the correct behavior of new parser for situation as described in https://github.com/exasol/script-languages-release/issues/652.
-    */
-    const std::string code = "%jar /buckets/bucketfs1/jars/exajdbc.jar; %jvmoption -Xms4m; class JAVA_UDF_3 {static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {String host_name = ctx.getString(\"col1\");}}\n/\n;";
-    options_map_t result;
-    parseOptions(code, result);
-    ASSERT_EQ(result.size(), 2);
-
-    const auto jar_option_result = result.find("jar");
-    ASSERT_NE(jar_option_result, result.end());
-    ASSERT_EQ(jar_option_result->second.size(), 1);
-    ASSERT_EQ(jar_option_result->second[0], buildOption("/buckets/bucketfs1/jars/exajdbc.jar", 0, 41));
-
-    const auto jvm_option_result = result.find("jvmoption");
-    ASSERT_NE(jvm_option_result, result.end());
-    ASSERT_EQ(jvm_option_result->second.size(), 1);
-    ASSERT_EQ(jvm_option_result->second[0], buildOption("-Xms4m", 42, 18));
-}
-
-
-TEST(ScriptOptionLinesTest, test_values_can_contain_spaces) {
-    /**
-    Verify assumptions as described in https://github.com/exasol/script-languages-release/issues/878
-    The parser is actually correct, but the client code incorrectly parses the result (see javacontainer_test.cc - quoted_jvm_option)
-    */
-    const std::string code =
-        "%jvmoption -Dhttp.agent=\"ABC DEF\";\n\n"
-        "class JVMOPTION_TEST_WITH_SPACE {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "	ctx.emit(\"Success!\");\n"
-        " }\n"
-        "}\n";
-    options_map_t result;
-    parseOptions(code, result);
-    ASSERT_EQ(result.size(), 1);
-
-    const auto jvm_option_result = result.find("jvmoption");
-    ASSERT_NE(jvm_option_result, result.end());
-    ASSERT_EQ(jvm_option_result->second.size(), 1);
-    ASSERT_EQ(jvm_option_result->second[0], buildOption("-Dhttp.agent=\"ABC DEF\"", 0, 34));
-}
-
-TEST(ScriptOptionLinesTest, test_multiple_lines_with_code) {
-    /**
-    Verify that the parser can read options coming after some code.
-    */
-    const std::string code =
-        "%jvmoption -Dhttp.agent=\"ABC DEF\"; class Abc{};\n\n"
-        "%jar /buckets/bucketfs1/jars/exajdbc.jar; class DEF{};\n";
-
-    options_map_t result;
-    parseOptions(code, result);
-    ASSERT_EQ(result.size(), 2);
-
-    const auto jvm_option_result = result.find("jvmoption");
-    ASSERT_NE(jvm_option_result, result.end());
-    ASSERT_EQ(jvm_option_result->second.size(), 1);
-    ASSERT_EQ(jvm_option_result->second[0], buildOption("-Dhttp.agent=\"ABC DEF\"", 0, 34));
-
-    const auto jar_option_result = result.find("jar");
-    ASSERT_NE(jar_option_result, result.end());
-    ASSERT_EQ(jar_option_result->second.size(), 1);
-    ASSERT_EQ(jar_option_result->second[0], buildOption("/buckets/bucketfs1/jars/exajdbc.jar", 49, 41));
-}
-
-
-class ScriptOptionLinesEscapeSequenceTest : public ::testing::TestWithParam<std::pair<std::string, std::string>> {};
-
-TEST_P(ScriptOptionLinesEscapeSequenceTest, test_escape_seq_in_option_value) {
-    const std::pair<std::string, std::string> option_value = GetParam();
-    /**
-    Verify that the parser replaces escape sequences correctly.
-    */
-    const std::string code =
-        "%jvmoption " + option_value.first + "; class Abc{};\n"
-        "%jar /buckets/bucketfs1/jars/exajdbc.jar; class DEF{};\n";
-
-    options_map_t result;
-    parseOptions(code, result);
-    ASSERT_EQ(result.size(), 2);
-
-    const auto jvm_option_result = result.find("jvmoption");
-    ASSERT_NE(jvm_option_result, result.end());
-    ASSERT_EQ(jvm_option_result->second.size(), 1);
-    EXPECT_EQ(jvm_option_result->second[0].value, option_value.second);
-
-    const auto jar_option_result = result.find("jar");
-    ASSERT_NE(jar_option_result, result.end());
-    ASSERT_EQ(jar_option_result->second.size(), 1);
-    ASSERT_EQ(jar_option_result->second[0].value, "/buckets/bucketfs1/jars/exajdbc.jar");
-}
-
-/*
- '\n' -> new line character
- '\r' -> return character
- '\;' -> semicolon
- '\\' -> backslash
- '\ ' or '\t' or '\f' or '\v' at start of option value -> replaced by the respective white space character
- '\ ' or '\t' or '\f' or '\v' in the middle of option value -> should not be replaced
- '\a' -> anything else should not be replaced.
- */
-const std::vector<std::pair<std::string, std::string>> escape_sequences =
-        {
-            std::make_pair("-Dhttp.agent=ABC\\nDEF", "-Dhttp.agent=ABC\nDEF"),
-            std::make_pair("-Dhttp.agent=ABC\\rDEF", "-Dhttp.agent=ABC\rDEF"),
-            std::make_pair("-Dhttp.agent=ABC\\;DEF", "-Dhttp.agent=ABC;DEF"),
-            std::make_pair("-Dhttp.agent=ABC\\\\rDEF", "-Dhttp.agent=ABC\\rDEF"),
-            std::make_pair("-Dhttp.agent=ABC\\aDEF", "-Dhttp.agent=ABC\\aDEF"), //any other escape sequence must stay as is
-            std::make_pair("\\n-Dhttp.agent=ABCDEF", "\n-Dhttp.agent=ABCDEF"),
-            std::make_pair("\\r-Dhttp.agent=ABCDEF", "\r-Dhttp.agent=ABCDEF"),
-            std::make_pair("\\;-Dhttp.agent=ABCDEF", ";-Dhttp.agent=ABCDEF"),
-            std::make_pair("\\\\r-Dhttp.agent=ABCDEF", "\\r-Dhttp.agent=ABCDEF"),
-            std::make_pair("-Dhttp.agent=ABCDEF\\n", "-Dhttp.agent=ABCDEF\n"),
-            std::make_pair("-Dhttp.agent=ABCDEF\\r", "-Dhttp.agent=ABCDEF\r"),
-            std::make_pair("-Dhttp.agent=ABCDEF\\;", "-Dhttp.agent=ABCDEF;"),
-            std::make_pair("-Dhttp.agent=ABCDEF\\\\;", "-Dhttp.agent=ABCDEF\\"),
-            std::make_pair("-Dhttp.agent=ABCDEF\\\\\\;", "-Dhttp.agent=ABCDEF\\;"),
-            std::make_pair("-Dhttp.agent=ABC\\ DEF", "-Dhttp.agent=ABC\\ DEF"), //escaped white space in middle of string must stay as is
-            std::make_pair("\\ -Dhttp.agent=ABCDEF", " -Dhttp.agent=ABCDEF"),
-            std::make_pair("\\  \t -Dhttp.agent=ABCDEF", "  \t -Dhttp.agent=ABCDEF"),
-            std::make_pair("\\t-Dhttp.agent=ABCDEF", "\t-Dhttp.agent=ABCDEF"),
-            std::make_pair("\\f-Dhttp.agent=ABCDEF", "\f-Dhttp.agent=ABCDEF"),
-            std::make_pair("\\v-Dhttp.agent=ABCDEF", "\v-Dhttp.agent=ABCDEF")
-        };
-
-INSTANTIATE_TEST_SUITE_P(
-    ScriptOptionLines,
-    ScriptOptionLinesEscapeSequenceTest,
-    ::testing::ValuesIn(escape_sequences)
-);
-
-class ScriptOptionLinesRestTest : public ::testing::TestWithParam<std::string> {};
-
-TEST_P(ScriptOptionLinesRestTest, test_rest_with_tokens) {
-    const std::string rest = GetParam();
-    /**
-    Verify that the parser correctly ignores character sequences containing special parser tokens
-    after the options in a line.
-    */
-    const std::string code =
-        "%jvmoption -Dhttp.agent=abc; class Abc{};" + rest;
-
-    options_map_t result;
-    parseOptions(code, result);
-    ASSERT_EQ(result.size(), 1);
-
-    const auto jvm_option_result = result.find("jvmoption");
-    ASSERT_NE(jvm_option_result, result.end());
-    ASSERT_EQ(jvm_option_result->second.size(), 1);
-    ASSERT_EQ(jvm_option_result->second[0], buildOption("-Dhttp.agent=abc", 0, 28));
-}
-
-const std::vector<std::string> rest_strings =
-        {"\\n", "\\r", "something %blabla;", ";", "\\;", "\\;blabla", "\\   blabla", "\\t blabla"};
-
-INSTANTIATE_TEST_SUITE_P(
-    ScriptOptionLines,
-    ScriptOptionLinesRestTest,
-    ::testing::ValuesIn(rest_strings)
-);
\ No newline at end of file
diff --git a/exaudfclient/base/script_options_parser/legacy/test/BUILD b/exaudfclient/base/script_options_parser/legacy/test/BUILD
deleted file mode 100644
index c58d2bf..0000000
--- a/exaudfclient/base/script_options_parser/legacy/test/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-cc_test(
-    name = "script-options-legacy-parser-test",
-    srcs = ["script_option_lines_test.cpp"],
-    deps = [
-        "//script_options_parser/legacy:script_option_lines_parser_legacy",
-        "@googletest//:gtest_main",
-    ],
-)
\ No newline at end of file
diff --git a/exaudfclient/base/script_options_parser/legacy/test/script_option_lines_test.cpp b/exaudfclient/base/script_options_parser/legacy/test/script_option_lines_test.cpp
deleted file mode 100644
index 550f999..0000000
--- a/exaudfclient/base/script_options_parser/legacy/test/script_option_lines_test.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-#include "script_options_parser/legacy/script_option_lines.h"
-#include <gtest/gtest.h>
-#include <string>
-#include <exception>
-#include "script_options_parser/exception.h"
-
-const std::string whitespace = " \t\f\v";
-const std::string lineEnd = ";";
-
-using namespace ExecutionGraph;
-
-
-class ScriptOptionLinesWhitespaceTest : public ::testing::TestWithParam<std::tuple<std::string, std::string, std::string, std::string, std::string>> {};
-
-TEST_P(ScriptOptionLinesWhitespaceTest, WhitespaceExtractOptionLineTest) {
-    size_t pos;
-    const std::string prefix = std::get<0>(GetParam());
-    const std::string suffix = std::get<1>(GetParam());
-    const std::string option = std::get<2>(GetParam());
-    const std::string value = std::get<3>(GetParam());
-    const std::string payload =  std::get<4>(GetParam());
-    std::string code = prefix + option + value + lineEnd + suffix + "\n" + payload;
-    const std::string res = extractOptionLine(code, option, whitespace, lineEnd, pos);
-    EXPECT_EQ(res, value);
-    EXPECT_EQ(code, prefix + suffix + "\n" + payload);
-}
-
-std::vector<std::string> white_space_strings = {"", " ", "\t", "\f", "\v", "\n", " \t", "\t ", "\t\f", "\f\t", "\f ", " \f", "\t\v", "\v\t", "\v ", " \v", "\f\v", "\v\f", "  \t", " \t "};
-std::vector<std::string> keywords = {"%import", "jvmoption", "%scriptclass", "%jar", "%env"};
-std::vector<std::string> values = {"something", "com.mycompany.MyScriptClass", "LD_LIBRARY_PATH=/nvdriver", "-Xms128m -Xmx1024m -Xss512k", "/buckets/bfsdefault/default/my_code.jar"};
-std::vector<std::string> payloads = {"anything", "\n\ndef my_func:\n\tpass", "class MyJava\n public static void Main() {\n};\n"};
-
-INSTANTIATE_TEST_SUITE_P(
-    ScriptOptionLines,
-    ScriptOptionLinesWhitespaceTest,
-    ::testing::Combine(::testing::ValuesIn(white_space_strings),
-                       ::testing::ValuesIn(white_space_strings),
-                       ::testing::ValuesIn(keywords),
-                       ::testing::ValuesIn(values),
-                       ::testing::ValuesIn(payloads)
-    )
-);
-
-TEST(ScriptOptionLinesTest, ignore_anything_other_than_whitepsace) {
-    size_t pos;
-    std::string code =
-        "abc %option myoption;\n"
-        "\nmycode";
-    const std::string res = extractOptionLine(code, "%option", whitespace, lineEnd, pos);
-    EXPECT_TRUE(res.empty());
-}
-
-TEST(ScriptOptionLinesTest, need_line_end_character) {
-    size_t pos;
-    std::string code =
-        "%option myoption\n"
-        "\nmycode";
-   EXPECT_THROW({
-        const std::string res = extractOptionLine(code, "%option", whitespace, lineEnd, pos);
-    }, OptionParserException );
-}
-
-TEST(ScriptOptionLinesTest, only_finds_the_first_option_same_key) {
-    size_t pos;
-    std::string code =
-        "%option myoption; %option mysecondoption;\n"
-        "\nmycode";
-    const std::string res = extractOptionLine(code, "%option", whitespace, lineEnd, pos);
-    const std::string expected_resulting_code =
-        " %option mysecondoption;\n"
-        "\nmycode";
-
-    EXPECT_EQ(res, "myoption");
-    EXPECT_EQ(code, expected_resulting_code);
-}
-
-TEST(ScriptOptionLinesTest, only_finds_the_first_option_different_key) {
-    size_t pos;
-    std::string code =
-        "%option myoption; %otheroption mysecondoption;\n"
-        "\nmycode";
-    const std::string res = extractOptionLine(code, "%option", whitespace, lineEnd, pos);
-    const std::string expected_resulting_code =
-        " %otheroption mysecondoption;\n"
-        "\nmycode";
-
-    EXPECT_EQ(res, "myoption");
-    EXPECT_EQ(code, expected_resulting_code);
-}
-
-class ScriptOptionLinesInvalidOptionTest : public ::testing::TestWithParam<std::string> {};
-
-
-TEST_P(ScriptOptionLinesInvalidOptionTest, value_is_mandatory) {
-    size_t pos;
-    const std::string invalid_option = GetParam();
-    std::string code = invalid_option + "\nsomething";
-    EXPECT_THROW({
-     const std::string res = extractOptionLine(code, "%option", whitespace, lineEnd, pos);
-    }, OptionParserException );
-}
-
-std::vector<std::string> invalid_options = {"%option ;", "%option \n", "\n%option\n;", "%option\nvalue;"};
-
-INSTANTIATE_TEST_SUITE_P(
-    ScriptOptionLines,
-    ScriptOptionLinesInvalidOptionTest,
-    ::testing::ValuesIn(invalid_options)
-);
-
-TEST(ScriptOptionLinesTest, ignores_any_other_option) {
-    size_t pos;
-    const std::string original_code =
-        "%option myoption; %option mysecondoption;\n"
-        "\nmycode";
-    std::string code = original_code;
-    const std::string res = extractOptionLine(code, "%mythirdoption", whitespace, lineEnd, pos);
-    EXPECT_TRUE(res.empty());
-    EXPECT_EQ(code, original_code);
-}
-
-
-TEST(ScriptOptionLinesTest, test_all_in_one_line_does_second_option_does_not_work) {
-    /**
-    Verify the wrong behavior and assumptions as described in https://github.com/exasol/script-languages-release/issues/652.
-    Here we call `extractOptionLine()` with the keys in the order of the new implementation (first for key 'jvmoption').
-    This is supposed to not work.
-    */
-    size_t pos;
-    const std::string original_code = "%jar /buckets/bucketfs1/jars/exajdbc.jar; %jvmoption -Xms4m; class JAVA_UDF_3 {static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {String host_name = ctx.getString(\"col1\");}}\n/\n;";
-    std::string code = original_code;
-    const std::string res = extractOptionLine(code, "%jvmoption", whitespace, lineEnd, pos);
-    EXPECT_TRUE(res.empty());
-    EXPECT_EQ(code, original_code);
-}
-
-TEST(ScriptOptionLinesTest, test_all_in_one_line_does_first_option_does_work) {
-    /**
-    Verify the wrong behavior and assumptions as described in https://github.com/exasol/script-languages-release/issues/652.
-    Here we call `extractOptionLine()` with the keys in the order of the old implementation (first for key '%jar', then for key 'jvmoption').
-    This is supposed to work.
-    */
-    size_t pos;
-    const std::string original_code = "%jar /buckets/bucketfs1/jars/exajdbc.jar; %jvmoption -Xms4m; class JAVA_UDF_3 {static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {String host_name = ctx.getString(\"col1\");}}\n/\n;";
-    std::string code = original_code;
-    std::string res = extractOptionLine(code, "%jar", whitespace, lineEnd, pos);
-    EXPECT_EQ(res, "/buckets/bucketfs1/jars/exajdbc.jar");
-    EXPECT_EQ(code, " %jvmoption -Xms4m; class JAVA_UDF_3 {static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {String host_name = ctx.getString(\"col1\");}}\n/\n;");
-    res = extractOptionLine(code, "%jvmoption", whitespace, lineEnd, pos);
-    EXPECT_EQ(code, "  class JAVA_UDF_3 {static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {String host_name = ctx.getString(\"col1\");}}\n/\n;");
-}
-
-TEST(ScriptOptionLinesTest, test_values_must_not_contain_spaces) {
-    /**
-    Verify the wrong behavior and assumptions as described in https://github.com/exasol/script-languages-release/issues/878
-    The parser is actually correct, but the client code incorrectly parses the result (see javacontainer_test.cc - quoted_jvm_option)
-    */
-    size_t pos;
-    const std::string original_code =
-        "%jvmoption -Dhttp.agent=\"ABC DEF\";\n\n"
-        "class JVMOPTION_TEST_WITH_SPACE {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "	ctx.emit(\"Success!\");\n"
-        " }\n"
-        "}\n";
-    std::string code = original_code;
-    std::string res = extractOptionLine(code, "%jvmoption", whitespace, lineEnd, pos);
-    const std::string expected_result_code =
-        "\n\n"
-        "class JVMOPTION_TEST_WITH_SPACE {\n"
-        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
-        "	ctx.emit(\"Success!\");\n"
-        " }\n"
-        "}\n";
-    EXPECT_EQ(res, "-Dhttp.agent=\"ABC DEF\"");
-    EXPECT_EQ(code, expected_result_code);
-}
-
-TEST(ScriptOptionLinesTest, test_multiple_lines_with_code) {
-    /**
-    Verify that the parser can read options coming after some code.
-    */
-    size_t pos;
-    const std::string original_code =
-        "%jvmoption -Dhttp.agent=\"ABC DEF\"; class Abc{};\n\n"
-        "%jar /buckets/bucketfs1/jars/exajdbc.jar; class DEF{};\n";
-    std::string code = original_code;
-
-    std::string res = extractOptionLine(code, "%jvmoption", whitespace, lineEnd, pos);
-    EXPECT_EQ(res, "-Dhttp.agent=\"ABC DEF\"");
-    std::string expected_result_code =
-        " class Abc{};\n\n"
-        "%jar /buckets/bucketfs1/jars/exajdbc.jar; class DEF{};\n";
-    EXPECT_EQ(code, expected_result_code);
-
-    res = extractOptionLine(code, "%jar", whitespace, lineEnd, pos);
-    EXPECT_EQ(res, "/buckets/bucketfs1/jars/exajdbc.jar");
-    expected_result_code =
-        " class Abc{};\n\n"
-        " class DEF{};\n";
-
-    EXPECT_EQ(code, expected_result_code);
-}
diff --git a/test_container/build/Dockerfile b/test_container/build/Dockerfile
index f5ca3b3..f8fd19d 100644
--- a/test_container/build/Dockerfile
+++ b/test_container/build/Dockerfile
@@ -5,9 +5,6 @@ COPY deps/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
 
 RUN apt-get -y update && \
     apt-get -y install \
-        openjdk-17-jdk \
-        openjdk-11-jdk \
-        maven \
         locales \
         python3.10-venv \
         python3-pip \
@@ -23,9 +20,8 @@ RUN apt-get -y update && \
 
 RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh
 
-RUN mkdir -p downloads/ODBC downloads/JDBC downloads/EXAplus
+RUN mkdir -p downloads/ODBC downloads/EXAplus
 RUN curl -s https://x-up.s3.amazonaws.com/7.x/24.1.1/Exasol_ODBC-24.1.1-Linux_x86_64.tar.gz | tar -C downloads/ODBC --strip-components 2 -zxf -
-RUN curl -s https://x-up.s3.amazonaws.com/7.x/24.1.1/Exasol_JDBC-24.1.1.tar.gz | tar -C downloads/JDBC --strip-components 2 -zxf -
 RUN curl -s https://x-up.s3.amazonaws.com/7.x/24.1.1/EXAplus-24.1.1.tar.gz | tar -C downloads/EXAplus --strip-components 2 -zxf -
 ENV EXAPLUS=/downloads/EXAplus/exaplus
 
@@ -34,4 +30,3 @@ RUN pip3 install -r "requirements.txt"
 
 RUN mkdir -p /dev_tools
 COPY deps/install_dev_tools.sh /dev_tools
-COPY deps/maven-toolchains.xml /root/.m2/toolchains.xml
diff --git a/test_container/build/deps/maven-toolchains.xml b/test_container/build/deps/maven-toolchains.xml
deleted file mode 100644
index 7d6683d..0000000
--- a/test_container/build/deps/maven-toolchains.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd">
-    <toolchain>
-        <type>jdk</type>
-        <provides>
-            <version>11</version>
-        </provides>
-        <configuration>
-            <jdkHome>/usr/lib/jvm/java-11-openjdk-amd64/</jdkHome>
-        </configuration>
-    </toolchain>
-    <toolchain>
-        <type>jdk</type>
-        <provides>
-            <version>17</version>
-        </provides>
-        <configuration>
-            <jdkHome>/usr/lib/jvm/java-17-openjdk-amd64/</jdkHome>
-        </configuration>
-    </toolchain>
-</toolchains>
diff --git a/test_container/tests/test/disabled/ldlibrarypath.py b/test_container/tests/test/disabled/ldlibrarypath.py
index cf59fbf..0f52d25 100644
--- a/test_container/tests/test/disabled/ldlibrarypath.py
+++ b/test_container/tests/test/disabled/ldlibrarypath.py
@@ -102,32 +102,5 @@ def test_importScript_dynamic(self):
         rows = self.query('''select import_mod()''')
         self.assertRowsEqual([("import_direct:some_imported_value",)],rows)
 
-    def test_importScript_static(self):
-        self.query(udf.fixindent('''
-            CREATE OR REPLACE java SCALAR SCRIPT
-            IMPORTED_X()
-            RETURNS int AS
-            class IMPORTED_X {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return 1;
-                }
-            }
-            '''))
-
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                IMPORTING_X()
-                RETURNS int AS
-                %import	IMPORTED_X;
-                class IMPORTING_X {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1+IMPORTED_X.run(exa, ctx);
-                    }
-                }
-                '''))
-        rows = self.query('SELECT importing_x()')
-        self.assertRowsEqual([(2,)], rows)
-
-
 if __name__ == '__main__':
     udf.main()
diff --git a/test_container/tests/test/generic/java/basic.py b/test_container/tests/test/generic/java/basic.py
deleted file mode 100755
index 863586d..0000000
--- a/test_container/tests/test/generic/java/basic.py
+++ /dev/null
@@ -1,300 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-
-
-def create_set_returns_has_empty_input(test_case):
-    test_case.query(udf.fixindent('''
-            CREATE java SET SCRIPT
-            set_returns_has_empty_input(a double) RETURNS boolean AS
-            class SET_RETURNS_HAS_EMPTY_INPUT {
-                static boolean run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return ctx.getDouble("a") == null;
-                }
-            }
-            /
-        '''))
-
-def create_set_emits_has_empty_input(test_case):
-    test_case.query(udf.fixindent('''
-            CREATE java SET SCRIPT
-            set_emits_has_empty_input(a double) EMITS (x double, y varchar(10)) AS
-            class SET_EMITS_HAS_EMPTY_INPUT {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getDouble("a") == null)
-            ctx.emit(1,"1");
-                    else
-            ctx.emit(2,"2");
-                }
-            }
-            /
-            '''))
-
-
-class _JavaUdfSetup(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-        self.query('OPEN SCHEMA FN1')
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            basic_emit_several_groups(a INTEGER, b INTEGER)
-            EMITS (i INTEGER, j VARCHAR(40)) AS
-            class BASIC_EMIT_SEVERAL_GROUPS {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    for (int n = 0; n < ctx.getInteger("a"); n++)
-            for (int i = 0; i < ctx.getInteger("b"); i++)
-                ctx.emit(i, exa.getVmId());
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            basic_emit_two_ints()
-            EMITS (i INTEGER, j INTEGER) AS
-            class BASIC_EMIT_TWO_INTS {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(1,2);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            basic_nth_partial_sum(n INTEGER)
-            RETURNS INTEGER as
-            class BASIC_NTH_PARTIAL_SUM {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getInteger("n") != null)
-            return ctx.getInteger("n") * (ctx.getInteger("n") + 1) / 2;
-                    return 0;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            basic_range(n INTEGER)
-            EMITS (n INTEGER) AS
-            class BASIC_RANGE {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getInteger("n") != null)
-            for (int i = 0; i < ctx.getInteger("n"); i++)
-                ctx.emit(i);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SET SCRIPT
-            basic_sum(x INTEGER)
-            RETURNS INTEGER AS
-            class BASIC_SUM {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int s = 0;
-                    while (true) {
-            if (ctx.getInteger("x") != null)
-                s += ctx.getInteger("x");
-            if (!ctx.next())
-                break;
-                    }
-                    return s;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SET SCRIPT
-            basic_sum_grp(x INTEGER)
-            EMITS (s INTEGER) AS
-            class BASIC_SUM_GRP {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int s = 0;
-                    while (true) {
-            if (ctx.getInteger("x") != null)
-                s += ctx.getInteger("x");
-            if (!ctx.next())
-                break;
-                    }
-                    ctx.emit(s);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SET SCRIPT
-            basic_test_reset(i INTEGER, j VARCHAR(40))
-            EMITS (k INTEGER) AS
-            class BASIC_TEST_RESET {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(ctx.getInteger("i"));
-                    ctx.next();
-                    ctx.emit(ctx.getInteger("i"));
-                    ctx.reset();
-                    ctx.emit(ctx.getInteger("i"));
-                    ctx.next();
-                    ctx.emit(ctx.getInteger("i"));
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            performance_map_characters(text VARCHAR(1000))
-            EMITS (w CHAR(1), c INTEGER) AS
-            class PERFORMANCE_MAP_CHARACTERS {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    String text = ctx.getString("text");
-                    if (text != null) {
-            for (int i = 0; i < text.length(); i++) {
-                if (Character.isHighSurrogate(text.charAt(i))) {
-                    ctx.emit(text.substring(i, i + 2), 1);
-                    i++;
-                }
-                else {
-                    ctx.emit(text.substring(i, i + 1), 1);
-                }
-            }
-                    }
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SET SCRIPT
-            performance_reduce_characters(w CHAR(1), c INTEGER)
-            EMITS (w CHAR(1), c INTEGER) AS
-            class PERFORMANCE_REDUCE_CHARACTERS {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int c = 0;
-                    String w = ctx.getString("w");
-                    if (w != null) {
-            do {
-                c += 1;
-            } while (ctx.next());
-            ctx.emit(w, c);
-                    }
-                }
-            }
-            /
-        '''))
-
-        create_set_emits_has_empty_input(self)
-        create_set_returns_has_empty_input(self)
-
-class BasicTest(_JavaUdfSetup):
-
-    def test_basic_scalar_emits(self):
-        rows = self.query('''
-            SELECT fn1.basic_range(3)
-            FROM DUAL
-            ''')
-        self.assertRowsEqual([(x,) for x in range(3)], sorted(rows))
-    
-    def test_basic_set_returns(self):
-        rows = self.query('''
-            SELECT fn1.basic_sum(3)
-            FROM DUAL
-            ''')
-        self.assertRowsEqual([(3,)], rows)
-
-    def test_emit_two_ints(self):
-        rows = self.query('''
-            SELECT fn1.basic_emit_two_ints()
-            FROM DUAL''')
-        self.assertRowsEqual([(1, 2)], rows)
-
-    def test_simple_combination(self):
-        rows = self.query('''
-            SELECT fn1.basic_sum(psum)
-            FROM (
-                SELECT fn1.basic_nth_partial_sum(n) AS PSUM
-                FROM (
-                    SELECT fn1.basic_range(10)
-                    FROM DUAL
-                )
-            )''')
-        self.assertRowsEqual([(165,)], rows)
-
-    def test_simple_combination_grouping(self):
-        rows = self.query('''
-            SELECT fn1.BASIC_SUM_GRP(psum)
-            FROM (
-                SELECT MOD(N, 3) AS n,
-                    fn1.basic_nth_partial_sum(n) AS psum
-                FROM (
-                    SELECT fn1.basic_range(10)
-                    FROM DUAL
-                )
-            )
-            GROUP BY n
-            ORDER BY 1''')
-        self.assertRowsEqual([(39.0,), (54.0,), (72.0,)], rows)
-
-    def test_reset(self):
-        rows = self.query('''
-            SELECT fn1.basic_test_reset(i, j)
-            FROM (SELECT fn1.basic_emit_several_groups(16, 8) FROM DUAL)
-            GROUP BY i
-            ORDER BY 1''')
-        self.assertRowsEqual([(0.0,), (0.0,), (0.0,), (0.0,), (1.0,), (1.0,), (1.0,), (1.0,), (2.0,)], rows[:9])
-
-    def test_order_by_clause(self):
-        rows = self.query('''
-            SELECT fn1.performance_reduce_characters(w, c)
-            FROM (
-               SELECT fn1.performance_map_characters('hello hello hello abc')
-               FROM DUAL
-            )
-            GROUP BY w
-            ORDER BY c DESC''')
-
-        unsorted_list = [tuple(x) for x in rows]
-        sorted_list = sorted(unsorted_list, key=lambda x: x[1], reverse=True)
-        #for x in zip(unsorted_list, sorted_list):
-        #    print x
-
-        self.assertEqual(sorted_list, unsorted_list)
-
-
-class SetWithEmptyInput(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-        self.query('OPEN SCHEMA FN1')
-        self.query('CREATE TABLE FN2.empty_table(c int)')
-        
-        create_set_returns_has_empty_input(self)
-        create_set_emits_has_empty_input(self)
-
-    def test_set_returns_has_empty_input_group_by(self):
-        self.query("""select FN1.set_returns_has_empty_input(c) from FN2.empty_table group by 'X'""")
-        self.assertEqual(0, self.rowcount())
-
-    def test_set_returns_has_empty_input_no_group_by(self):
-        rows = self.query('''select FN1.set_returns_has_empty_input(c) from FN2.empty_table''')
-        self.assertRowsEqual([(None,)], rows)
-
-
-    def test_set_emits_has_empty_input_group_by(self):
-        self.query("""select FN1.set_emits_has_empty_input(c) from FN2.empty_table group by 'X'""")
-        self.assertEqual(0, self.rowcount())
-
-    def test_set_emits_has_empty_input_no_group_by(self):
-        rows = self.query('''select FN1.set_emits_has_empty_input(c) from FN2.empty_table''')
-        self.assertRowsEqual([(None,None)], rows)
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/generic/java/combinations.py b/test_container/tests/test/generic/java/combinations.py
deleted file mode 100755
index cdcfd93..0000000
--- a/test_container/tests/test/generic/java/combinations.py
+++ /dev/null
@@ -1,482 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-from exasol_python_test_framework.udf import useData
-
-
-class _JavaUdfSetup(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-        self.query('OPEN SCHEMA FN1')
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            basic_range(n INTEGER)
-            EMITS (n INTEGER) AS
-            class BASIC_RANGE {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getInteger("n") != null)
-            for (int i = 0; i < ctx.getInteger("n"); i++)
-                ctx.emit(i);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SET SCRIPT
-            basic_sum(x INTEGER)
-            RETURNS INTEGER AS
-            class BASIC_SUM {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int s = 0;
-                    while (true) {
-            if (ctx.getInteger("x") != null)
-                s += ctx.getInteger("x");
-            if (!ctx.next())
-                break;
-                    }
-                    return s;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SET SCRIPT
-            basic_sum_grp(x INTEGER)
-            EMITS (s INTEGER) AS
-            class BASIC_SUM_GRP {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int s = 0;
-                    while (true) {
-            if (ctx.getInteger("x") != null)
-                s += ctx.getInteger("x");
-            if (!ctx.next())
-                break;
-                    }
-                    ctx.emit(s);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            SCALAR_EMITS(x double, y double)
-            emits (x double, y double) as
-            class SCALAR_EMITS {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    for (int i = ctx.getDouble("x").intValue(); i < (int)(ctx.getDouble("y") + 1); i++)
-            ctx.emit((float) i, (float) (i * i));
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            SCALAR_RETURNS(x double, y double)
-            returns double as
-            class SCALAR_RETURNS {
-                static double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return ctx.getDouble("x") + ctx.getDouble("y");
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java set script
-            SET_EMITS(x double, y double)
-            emits (x double, y double) as
-            class SET_EMITS {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    while (true) {
-            ctx.emit(ctx.getDouble("y"), ctx.getDouble("x"));
-            if (!ctx.next())
-                break;
-                    }
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java set script
-            SET_RETURNS(x double, y double)
-            returns double as
-            class SET_RETURNS {
-                static double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    double acc = 0.0;
-                    while (true) {
-            acc = acc + ctx.getDouble("x") + ctx.getDouble("y");
-            if (!ctx.next())
-                break;
-                    }
-                    return acc;
-                }
-            }
-            /
-        '''))
-        
-        self.query('DROP SCHEMA combinations CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA combinations')
-        self.query('CREATE TABLE combinations.small(x DOUBLE, y DOUBLE)')
-        self.query('INSERT INTO combinations.small VALUES (0.1, 0.2), (0.2, 0.1)')
-
-
-class Combinations_1_ary(_JavaUdfSetup):
-    def test_set_returns(self):
-        rows = self.query('''
-		        SELECT fn1.SET_RETURNS(x,y)
-                FROM combinations.small''')
-        self.assertEqual(round(0.6 / 2), round(rows[0][0] / 2))
-
-
-    def test_scalar_returns(self):
-        rows = self.query('''
-                SELECT round(fn1.scalar_returns(x,y) / 2)
-                FROM combinations.small''')
-        self.assertRowsEqual([(round(0.3 / 2),), (round(0.3 / 2),)], rows)
-
-    def test_scalar_emits(self):
-        rows = self.query('''
-                SELECT fn1.scalar_emits(x * 10 ,y * 10)
-                FROM combinations.small''')
-        self.assertRowsEqual([(1, 1,), (2, 4,)], rows)
-
-    def test_set_emits(self):
-        rows = self.query('''
-                SELECT fn1.set_emits(x * 10 ,y * 10)
-                FROM combinations.small''')
-        self.assertRowsEqual([(2.0, 1.0,), (1.0, 2.0,)], rows)
-
-    def test_two_scalar_returns(self):
-        rows = self.query('''
-                SELECT
-                    fn1.scalar_returns(fn1.scalar_returns(x * 10 ,y * 10),
-                    fn1.scalar_returns(y * 10 ,x * 10))
-                FROM combinations.small''')
-        self.assertRowsEqual([(6,), (6,)], rows)
-
-
-class Combinations_2_ary_scalar_returns(_JavaUdfSetup):
-    def test_scalar_returns_scalar_emits(self):
-        rows = self.query('''
-                SELECT fn1.scalar_returns(x * 10 ,y * 10 )
-                FROM (
-                    SELECT fn1.scalar_emits(x * 10 ,y * 10)
-                    FROM combinations.small
-                )''')
-        self.assertRowsEqual([(20,), (60,)], rows)
-
-    def test_scalar_returns_set_returns_inline(self):
-        rows = self.query('''
-                SELECT
-                    fn1.scalar_returns(
-                        fn1.set_returns(x * 10, y * 10),
-                        fn1.set_returns(x * 10, y * 10)
-                    )
-                FROM combinations.small''')
-        self.assertRowsEqual([(12,)], rows)
-
-    def test_scalar_returns_set_returns_1(self):
-        rows = self.query('''
-                SELECT fn1.scalar_returns(a, 5)
-                FROM (
-                    SELECT fn1.set_returns(x * 10, y * 10) AS a
-                    FROM combinations.SMALL
-                )
-                ''')
-        self.assertRowsEqual([(11,)], rows)
-
-    def test_scalar_returns_set_returns_2(self):
-        rows = self.query('''
-                SELECT fn1.scalar_returns(aa.a, bb.a)
-                FROM (
-                    SELECT fn1.set_returns(x * 10, y * 20) AS a
-                    FROM combinations.SMALL
-                ) AS aa,
-                (
-                    SELECT fn1.set_returns(x * 20, y * 10) AS a
-                    FROM combinations.SMALL
-                ) AS bb
-                ''')
-        self.assertRowsEqual([(18,)], rows)
-
-    def test_scalar_returns_set_emits_1(self):
-        rows = self.query('''
-                SELECT fn1.scalar_returns(x * 10, y * 10)
-                FROM (
-                    SELECT fn1.set_emits(x * 10, y * 10)
-                    FROM combinations.small
-                )''')
-        self.assertRowsEqual([(30,), (30,)], rows)
-
-    def test_scalar_returns_set_emits_2(self):
-        rows = self.query('''
-                SELECT fn1.scalar_returns(aa.x * 10, bb.x * 10)
-                FROM (
-                    SELECT fn1.set_emits(x * 10, y * 10)
-                    FROM combinations.small
-                ) AS aa,
-                (
-                    SELECT fn1.set_emits(x * 10, y * 10)
-                    FROM combinations.small
-                ) AS bb
-                WHERE aa.x = bb.y and aa.y = bb.x
-                ''')
-        self.assertRowsEqual([(30,), (30,)], rows)
-
-
-class Combinations_2_ary_scalar_emits(_JavaUdfSetup):
-    def test_scalar_emits_scalar_returns_inline(self):
-        rows = self.query('''
-                SELECT
-                    fn1.scalar_emits(
-                        fn1.scalar_returns(x * 10, y * 10),
-                        fn1.scalar_returns(y * 10, x * 10)
-                    )
-                FROM combinations.small''')
-        self.assertRowsEqual([(3, 9,), (3, 9,)], rows)
-
-    def test_scalar_emits_scalar_returns(self):
-        rows = self.query('''
-                SELECT fn1.scalar_emits(a, b)
-                FROM (
-                    SELECT 
-                        fn1.scalar_returns(x * 10 ,y * 10) AS A,
-                        fn1.scalar_returns(y * 10 ,x * 10) AS B
-                    FROM combinations.small
-                )
-                ''')
-        self.assertRowsEqual([(3, 9,), (3, 9,)], rows)
-
-    def test_scalar_emits_scalar_emits(self):
-        rows = self.query('''
-                SELECT fn1.scalar_emits(x * 10,y * 10)
-                FROM (
-                    SELECT fn1.scalar_emits(x * 10,y * 10)
-                    FROM combinations.small
-                )
-                ORDER by x,y''')
-        r = [(10.0, 100.0)]
-        r.extend([(i, i * i) for i in range(20, 41)])
-        self.assertRowsEqual(r, rows)
-
-    def test_scalar_emits_set_returns_inline(self):
-        with self.assertRaisesRegex(Exception, 'encapsulated set function'):
-            self.query('''
-                    SELECT
-                        fn1.scalar_emits(
-                            fn1.set_returns(x * 10, y * 10),
-                            fn1.set_returns(x * 10, y * 10)
-                        )
-                    FROM combinations.small''')
-
-    def test_scalar_emits_set_returns(self):
-        rows = self.query('''
-                SELECT fn1.scalar_emits(a, b)
-                FROM (
-                    SELECT fn1.set_returns(x * 10, y * 10) AS a
-                    FROM combinations.small
-                ),
-                (
-                    SELECT fn1.set_returns(x * 10, y *10) AS b
-                    FROM combinations.small
-                )
-                ''')
-        self.assertRowsEqual([(6, 36)], rows)
-
-    def test_scalar_emits_set_emits(self):
-        rows = self.query('''
-            SELECT fn1.scalar_emits(x * 10, y * 10)
-            FROM (
-                SELECT fn1.set_emits(x * 10, y * 10)
-                FROM combinations.small
-            )''')
-        r = ([(i, i * i) for i in range(10, 21)])
-        self.assertRowsEqual(r, rows)
-
-
-class Combinations_2_ary_set_returns(_JavaUdfSetup):
-    def test_set_returns_scalar_returns(self):
-        rows = self.query('''
-                SELECT
-                    fn1.set_returns(
-                        fn1.scalar_returns(x * 10, y * 10),
-                        fn1.scalar_returns(y * 10, x * 10)
-                    )
-                FROM combinations.small''')
-        self.assertRowsEqual([(12,)], rows)
-
-    def test_set_returns_scalar_emits(self):
-        rows = self.query('''
-            SELECT fn1.set_returns(x*10, y*10)
-            FROM (
-                SELECT fn1.scalar_emits(x*10, y*10)
-                FROM combinations.small
-            )''')
-        self.assertRowsEqual([(80,)], rows)
-
-    def test_set_returns_set_returns_inline(self):
-        with self.assertRaisesRegex(Exception, 'encapsulated set function'):
-            self.query('''
-                SELECT  
-                    fn1.set_returns(
-                        fn1.set_returns(x*10, y*10),
-                        fn1.set_returns(x*10, y*10)
-                    )
-                FROM combinations.small''')
-
-    def test_set_returns_set_returns(self):
-        rows = self.query('''
-                SELECT fn1.set_returns(a, b)
-                FROM(
-                    SELECT fn1.set_returns(x*20, y*30) AS a
-                    FROM combinations.small
-                ),
-                (
-                    SELECT fn1.set_returns(x*50, y*70) AS b
-                    FROM combinations.small
-                )''')
-        self.assertRowsEqual([(51,)], rows)
-
-    def test_set_returns_set_emits(self):
-        rows = self.query('''
-            SELECT fn1.set_returns(x*10, y*10)
-            FROM (
-                SELECT fn1.set_emits(x*10, y*10)
-                FROM combinations.small
-            )''')
-        self.assertRowsEqual([(60,)], rows)
-
-
-class Combinations_2_ary_set_emits(_JavaUdfSetup):
-    def test_set_emits_scalar_returns(self):
-        rows = self.query('''
-            SELECT
-                fn1.set_emits(
-                    fn1.scalar_returns(x*10, y*10),
-                    fn1.scalar_returns(y*10, x*10)
-                )
-            FROM combinations.small''')
-        self.assertRowsEqual([(3, 3,), (3, 3,)], rows)
-
-    def test_set_emits_scalar_emits(self):
-        rows = self.query('''
-                SELECT fn1.set_emits(x*10, y*10)
-                FROM (
-                    SELECT fn1.scalar_emits(x*10, 10*y)
-                    FROM combinations.small
-                )
-                ORDER BY x, y;''')
-        self.assertRowsEqual([(10, 10,), (40, 20,)], rows)
-
-    def test_set_emits_set_returns_inline(self):
-        with self.assertRaisesRegex(Exception, 'encapsulated set function'):
-            self.query('''
-                SELECT
-                    fn1.set_emits(
-                        fn1.set_returns(x*10, 10*y),
-                        fn1.set_returns(10*x, y*10)
-                    )
-                FROM combinations.small''')
-
-    def test_set_emits_set_returns(self):
-        rows = self.query('''
-                SELECT fn1.set_emits(a, b)
-                FROM (
-                    SELECT fn1.set_returns(x*20, 30*y) AS a
-                    FROM combinations.small
-                ),
-                (
-                    SELECT fn1.set_returns(50*x, y*70) AS b
-                    FROM combinations.small
-                )
-                ''')
-        self.assertRowsEqual([(36, 15,)], rows)
-
-    def test_set_emits_set_emits(self):
-        rows = self.query('''
-                SELECT fn1.set_emits(x * 10 , 10 * y)
-                FROM (
-                    SELECT fn1.set_emits(x * 10, y *10)
-                    FROM combinations.small
-                )
-                ORDER BY x, y;''')
-        self.assertRowsEqual([(10, 20,), (20, 10,)], rows)
-
-
-class Combinations_3_ary(_JavaUdfSetup):
-    def test_set_returns_set_emits_scalar_emits(self):
-        rows = self.query('''
-            SELECT fn1.basic_sum(s)
-            FROM (
-                SELECT fn1.basic_sum_grp(n)
-                FROM(
-                    SELECT fn1.basic_range(10)
-                    FROM DUAL
-                )
-            )''')
-        self.assertRowsEqual([(45,)], rows)
-
-    def test_set_returns_scalar_emits_scalar_emits(self):
-        rows = self.query('''
-            SELECT fn1.basic_sum(x)
-            FROM (
-                SELECT fn1.scalar_emits(n, n+2)
-                FROM(
-                    SELECT fn1.basic_range(10)
-                    FROM DUAL
-                )
-            )''')
-        self.assertRowsEqual([(165,)], rows)
-
-    def test_set_returns_scalar_returns_scalar_emits(self):
-        rows = self.query('''
-            SELECT fn1.basic_sum(x)
-            FROM (
-                SELECT fn1.scalar_returns(n, 2) AS x
-                FROM(
-                    SELECT fn1.basic_range(10)
-                    FROM DUAL
-                )
-            )''')
-        self.assertRowsEqual([(65,)], rows)
-
-
-class Combinations_n_ary(_JavaUdfSetup):
-    @staticmethod
-    def partial_sum(n, degree):
-        def basic_range(n, d):
-            if d == 0:
-                return list(range(n))
-            else:
-                return sum([list(range(x)) for x in basic_range(n + 1, d - 1)], [])
-
-        return len(basic_range(n, degree))
-
-    @useData((i,) for i in range(10))
-    def test_n_scalar_emits(self, n):
-
-        self.query(
-            'SELECT fn1.basic_range(n+1) FROM (\n' * n +
-            'SELECT fn1.basic_range(5) FROM DUAL\n' +
-            ')' * n)
-        self.assertEqual(self.partial_sum(5, n), self.rowcount())
-
-    @useData((i,) for i in range(10))
-    def test_set_returns_n_scalar_emits(self, n):
-
-        rows = self.query(
-            'SELECT max(n) FROM (' +
-            'SELECT fn1.basic_range(n+1) FROM (\n' * n +
-            'SELECT fn1.basic_range(5) FROM DUAL\n' +
-            ')' * (n + 1))
-        self.assertEqual(4, rows[0][0])
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/generic/java/dynamic_input.py b/test_container/tests/test/generic/java/dynamic_input.py
deleted file mode 100755
index 6376eb4..0000000
--- a/test_container/tests/test/generic/java/dynamic_input.py
+++ /dev/null
@@ -1,504 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-
-
-class _JavaUdfSetup(udf.TestCase):
-    LANG = 'java'
-    def setUp(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-        self.query('OPEN SCHEMA FN1')
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT
-            basic_scalar_emit( ... )
-            EMITS ("v" VARCHAR(2000)) as
-            import java.math.BigDecimal;
-            import java.sql.Date;
-            import java.sql.Timestamp;
-            class BASIC_SCALAR_EMIT {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int i = 0;
-                    while (i < exa.getInputColumnCount()) {
-            Class cls = exa.getInputColumnType(i);
-            if (cls == Integer.class) {
-                ctx.emit(ctx.getInteger(i).toString());
-            }
-            else if (cls == Long.class) {
-                ctx.emit(ctx.getLong(i).toString());
-            }
-            else if (cls == Class.forName("java.math.BigDecimal")) {
-                ctx.emit(ctx.getBigDecimal(i).toString());
-            }
-            else if (cls == Double.class) {
-                ctx.emit(ctx.getDouble(i).toString());
-            }
-            else if (cls == String.class) {
-                ctx.emit(ctx.getString(i));
-            }
-            else if (cls == Boolean.class) {
-                ctx.emit(ctx.getBoolean(i).toString());
-            }
-            else if (cls == Class.forName("java.sql.Date")) {
-                ctx.emit(ctx.getDate(i).toString());
-            }
-            else if (cls == Class.forName("java.sql.Timestamp")) {
-                ctx.emit(ctx.getTimestamp(i).toString());
-            }
-            i = i + 1;
-                    }
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT
-            basic_scalar_return( ... )
-            RETURNS VARCHAR(2000) as
-            class BASIC_SCALAR_RETURN {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int col = (int) exa.getInputColumnCount() - 1;
-                    Class cls = exa.getInputColumnType(col);
-                    if (cls == Integer.class) {
-            return ctx.getInteger(col).toString();
-                    }
-                    else if (cls == Long.class) {
-            return ctx.getLong(col).toString();
-                    }
-                    else if (cls == Class.forName("java.math.BigDecimal")) {
-            return ctx.getBigDecimal(col).toString();
-                    }
-                    else if (cls == Double.class) {
-            return ctx.getDouble(col).toString();
-                    }
-                    else if (cls == String.class) {
-            return ctx.getString(col);
-                    }
-                    else if (cls == Boolean.class) {
-            return ctx.getBoolean(col).toString();
-                    }
-                    else if (cls == Class.forName("java.sql.Date")) {
-            return ctx.getDate(col).toString();
-                    }
-                    else if (cls == Class.forName("java.sql.Timestamp")) {
-            return ctx.getTimestamp(col).toString();
-                    }
-                    else {
-            return null;
-                    }
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT
-            basic_set_emit( ... )
-            EMITS ("v" VARCHAR(2000)) as
-            import java.math.BigDecimal;
-            import java.sql.Date;
-            import java.sql.Timestamp;
-            class BASIC_SET_EMIT {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    String var = "result: ";
-                    while (true) {
-            for (int i = 0; i < exa.getInputColumnCount(); i++) {
-                Class cls = exa.getInputColumnType(i);
-                if (cls == Integer.class) {
-                    ctx.emit(ctx.getInteger(i).toString());
-                    var += ctx.getInteger(i).toString() + " , ";
-                }
-                else if (cls == Long.class) {
-                    ctx.emit(ctx.getLong(i).toString());
-                    var += ctx.getLong(i).toString() + " , ";
-                }
-                else if (cls == Class.forName("java.math.BigDecimal")) {
-                    ctx.emit(ctx.getBigDecimal(i).toString());
-                    var += ctx.getBigDecimal(i).toString() + " , ";
-                }
-                else if (cls == Double.class) {
-                    ctx.emit(ctx.getDouble(i).toString());
-                    var += ctx.getDouble(i).toString() + " , ";
-                }
-                else if (cls == String.class) {
-                    ctx.emit(ctx.getString(i));
-                    var += ctx.getString(i) + " , ";
-                }
-                else if (cls == Boolean.class) {
-                    ctx.emit(ctx.getBoolean(i).toString());
-                    var += ctx.getBoolean(i).toString() + " , ";
-                }
-                else if (cls == Class.forName("java.sql.Date")) {
-                    ctx.emit(ctx.getDate(i).toString());
-                    var += ctx.getDate(i).toString() + " , ";
-                }
-                else if (cls == Class.forName("java.sql.Timestamp")) {
-                    ctx.emit(ctx.getTimestamp(i).toString());
-                    var += ctx.getTimestamp(i).toString() + " , ";
-                }
-            }
-            if (!ctx.next())
-                break;
-                    }
-                    ctx.emit(var);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT
-            basic_set_return( ... )
-            RETURNS VARCHAR(2000) as
-            import java.math.BigDecimal;
-            import java.sql.Date;
-            import java.sql.Timestamp;
-            class BASIC_SET_RETURN {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    String var = "result: ";
-                    while (true) {
-            for (int i = 0; i < exa.getInputColumnCount(); i++) {
-                Class cls = exa.getInputColumnType(i);
-                if (cls == Integer.class) {
-                    var += ctx.getInteger(i).toString() + " , ";
-                }
-                else if (cls == Long.class) {
-                    var += ctx.getLong(i).toString() + " , ";
-                }
-                else if (cls == Class.forName("java.math.BigDecimal")) {
-                    var += ctx.getBigDecimal(i).toString() + " , ";
-                }
-                else if (cls == Double.class) {
-                    var += ctx.getDouble(i).toString() + " , ";
-                }
-                else if (cls == String.class) {
-                    var += ctx.getString(i) + " , ";
-                }
-                else if (cls == Boolean.class) {
-                    var += ctx.getBoolean(i).toString() + " , ";
-                }
-                else if (cls == Class.forName("java.sql.Date")) {
-                    var += ctx.getDate(i).toString() + " , ";
-                }
-                else if (cls == Class.forName("java.sql.Timestamp")) {
-                    var += ctx.getTimestamp(i).toString() + " , ";
-                }
-            }
-            if (!ctx.next())
-                break;
-                    }
-                    return var;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT
-            empty_set_emits( ... )
-            emits (x varchar(2000)) as
-            class EMPTY_SET_EMITS {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    emit(Integer.toString(1));
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT
-            empty_set_returns( ... )
-            returns varchar(2000) as
-            class EMPTY_SET_RETURNS {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return Integer.toString(1);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT
-            metadata_scalar_emit (...)
-            EMITS("v" VARCHAR(2000)) AS
-            class METADATA_SCALAR_EMIT {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(Long.toString(exa.getInputColumnCount()));
-                    for (int i = 0; i < exa.getInputColumnCount(); i++) {
-            ctx.emit(exa.getInputColumnName(i));
-            ctx.emit(exa.getInputColumnType(i).getCanonicalName());
-            ctx.emit(exa.getInputColumnSqlType(i));
-            ctx.emit(Long.toString(exa.getInputColumnPrecision(i)));
-            ctx.emit(Long.toString(exa.getInputColumnScale(i)));
-            ctx.emit(Long.toString(exa.getInputColumnLength(i)));
-                    }
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT
-            metadata_scalar_return (...)
-            RETURNS VARCHAR(2000) AS
-            class METADATA_SCALAR_RETURN {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return Long.toString(exa.getInputColumnCount());
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT
-            type_specific_add(...)
-            RETURNS VARCHAR(2000) as
-            import java.math.BigDecimal;
-            import java.sql.Date;
-            import java.sql.Timestamp;
-            class TYPE_SPECIFIC_ADD {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    String var = "result: ";
-                    Class cls = exa.getInputColumnType(0);
-                    if (cls == String.class) {
-            while (true) {
-                for (int i = 0; i < exa.getInputColumnCount(); i++) {
-                    var += ctx.getString(i) + " , ";
-                }
-                if (!ctx.next())
-                    break;
-            }
-                    }
-                    else if (cls == Integer.class || cls == Long.class || cls == Double.class) {
-            double sum = 0;
-            while (true) {
-                for (int i = 0; i < exa.getInputColumnCount(); i++) {
-                    sum += ctx.getDouble(i);
-                }
-                if (!ctx.next())
-                    break;
-            }
-            var += Double.toString(sum);
-                    }
-                    return var;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT
-            wrong_arg(...)
-            returns varchar(2000) as
-            class WRONG_ARG {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return ctx.getString(1);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT
-            wrong_operation(...)
-            returns varchar(2000) as
-            class WRONG_OPERATION {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return ctx.getString(0) * ctx.getString(1);
-                }
-            }
-            /
-        '''))
-        
-        self.query('DROP SCHEMA dynamic_input CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA dynamic_input')
-        self.query('CREATE TABLE dynamic_input.small(x VARCHAR(2000), y DOUBLE)')
-        self.query('''INSERT INTO dynamic_input.small VALUES ('Some string ... and some more', 2.2)''')
-        self.query('create table dynamic_input.groupt(id int, n double, v varchar(999))')
-        self.query('''insert into dynamic_input.groupt values (1,1,'aa'),
-                                                (1,2,'ab'),
-                                                (2,2,'ba')
-                                                ''')
-
-
-class DynamicMetadataTest(_JavaUdfSetup):
-
-    def test_meta_scalar_return(self):
-        rows = self.query('''
-            SELECT fn1.metadata_scalar_return('abc', cast(99 as double))
-            FROM DUAL
-            ''')
-        self.assertRowEqual(('2',), rows[0])
-
-    def test_meta_scalar_emit(self):
-        rows = self.query('''
-            SELECT fn1.metadata_scalar_emit('abc', cast(99 as double))
-            FROM DUAL
-            ''')
-        self.assertRowEqual(('2',), rows[0])
-        self.assertRowEqual(('0',), rows[1])
-        self.assertTrue(rows[2][0] == "string" or rows[2][0] == "<type 'unicode'>" or rows[2][0] == "character" or rows[2][0] == "java.lang.String" or rows[2][0] == "<class 'str'>")
-        self.assertRowEqual(('CHAR(3) ASCII',), rows[3])
-        self.assertRowEqual(('3',), rows[6])
-        self.assertRowEqual(('1',), rows[7])
-        self.assertTrue(rows[8][0] == 'number' or rows[8][0] == "<type 'float'>" or rows[8][0] == "double" or rows[8][0] == "java.lang.Double" or rows[8][0] == "<class 'float'>")
-        self.assertRowEqual(('DOUBLE',), rows[9])
-
-
-class DynamicInputBasic(_JavaUdfSetup):
-    def test_basic_scalar_emit_constants(self):
-        rows = self.query('''
-            SELECT fn1.basic_scalar_emit('abc', cast(99 as double))
-            FROM DUAL
-            ''')
-        self.assertTrue(rows[0][0] == 'abc' or rows[0][0] == "u'abc'" or rows[0][0] == "'abc'")
-        self.assertTrue(rows[1][0] == '99' or rows[1][0] == "99.0")
-
-    def test_basic_scalar_emit(self):
-        rows = self.query('''
-            SELECT fn1.basic_scalar_emit(x, y)
-            FROM dynamic_input.small
-            ''')
-        self.assertTrue(rows[0][0] == 'Some string ... and some more' or rows[0][0] == "u'Some string ... and some more'" or rows[0][0] == "'Some string ... and some more'")
-        self.assertRowEqual(('2.2',), rows[1])
-
-    def test_basic_scalar_return_constants(self):
-        rows = self.query('''
-            SELECT fn1.basic_scalar_return('abc', cast(99 as double))
-            FROM DUAL
-            ''')
-        self.assertTrue(rows[0][0] == '99' or rows[0][0] == "99.0")
-
-    def test_basic_scalar_return(self):
-        rows = self.query('''
-            SELECT fn1.basic_scalar_return(x, y, x, y, x, y, x, y, x, y, x, y, x, y, x, y)
-            FROM dynamic_input.small
-            ''')
-        self.assertRowEqual(('2.2',), rows[0])
-
-    def test_basic_set_emit_constants(self):
-        rows = self.query('''
-            SELECT fn1.basic_set_emit(cast(99 as double),'77','aaaa')
-            FROM DUAL
-            ''')
-        print("0---:"+str(rows[3][0]))
-        self.assertTrue(rows[0][0] == '99' or rows[0][0] == "99.0")
-        self.assertTrue(rows[1][0] == '77' or rows[1][0] == "u'77'" or rows[1][0] == "'77'")
-        self.assertTrue(rows[2][0] == 'aaaa' or rows[2][0] == "u'aaaa'" or rows[2][0] == "'aaaa'")
-        self.assertTrue(rows[3][0] == 'result:  , 99 , 77 , aaaa' or rows[3][0] == "result: 99.0 , u'77' , u'aaaa' , " or rows[3][0] == "result: 99 , 77 , aaaa , " or rows[3][0] == "result: 99.0 , 77 , aaaa , " or rows[3][0] == "result: 99.0 , '77' , 'aaaa' , ")
-
-    def test_basic_set_emit(self):
-        rows = self.query('''
-            SELECT fn1.basic_set_emit(n, v)
-            FROM dynamic_input.groupt GROUP BY id ORDER BY 1
-            ''')
-        self.assertTrue(rows[0][0] == '1' or rows[0][0] == "1.0" or rows[0][0] == "'aa'")
-        self.assertTrue(rows[1][0] == '2' or rows[1][0] == "2.0" or rows[1][0] == "'ab'")
-        self.assertTrue(rows[2][0] == '2' or rows[2][0] == "2.0" or rows[2][0] == "'ba'")
-        self.assertTrue(rows[3][0] == 'aa' or rows[3][0] == "result: 1.0 , u'aa' , 2.0 , u'ab' , " or rows[3][0] == "1.0")
-        self.assertTrue(rows[4][0] == 'ab' or rows[4][0] == "result: 2.0 , u'ba' , "  or rows[4][0] == "2.0")
-        self.assertTrue(rows[5][0] == 'ba' or rows[5][0] == "u'aa'" or rows[5][0] == "2.0")
-        self.assertTrue(rows[6][0] == 'result:  , 1 , aa , 2 , ab' or rows[6][0] == "u'ab'" or rows[6][0] == "result: 1 , aa , 2 , ab , " or rows[6][0] == "result: 1.0 , aa , 2.0 , ab , "  or rows[6][0] == "result: 1.0 , 'aa' , 2.0 , 'ab' , ")
-        self.assertTrue(rows[7][0] == 'result:  , 2 , ba' or rows[7][0] == "u'ba'" or rows[7][0] == "result: 2 , ba , " or rows[7][0] == "result: 2.0 , ba , " or rows[7][0] == "result: 2.0 , 'ba' , ")
-
-    def test_basic_set_emit_one_group(self):
-        rows = self.query('''
-            SELECT fn1.basic_set_emit(cast(id as double), n, v)
-            FROM dynamic_input.groupt ORDER BY 1
-            ''')
-        self.assertTrue(rows[0][0] == '1' or rows[0][0] == "1.0" or rows[0][0] == "'aa'")
-        self.assertTrue(rows[1][0] == '1' or rows[1][0] == "1.0" or rows[1][0] == "'ab'")
-        self.assertTrue(rows[2][0] == '1' or rows[2][0] == "1.0" or rows[2][0] == "'ba'")
-        self.assertTrue(rows[3][0] == '2' or rows[3][0] == "2.0" or rows[3][0] == "1.0")
-        self.assertTrue(rows[4][0] == '2' or rows[4][0] == "2.0" or rows[4][0] == "1.0")
-        self.assertTrue(rows[5][0] == '2' or rows[5][0] == "2.0" or rows[5][0] == "1.0")
-        self.assertTrue(rows[6][0] == 'aa' or rows[7][0] == "u'aa'" or rows[6][0] == "2.0")
-        self.assertTrue(rows[7][0] == 'ab' or rows[8][0] == "u'ab'" or rows[7][0] == "2.0")
-        self.assertTrue(rows[8][0] == 'ba' or rows[9][0] == "u'ba'" or rows[8][0] == "2.0")
-        self.assertTrue(rows[9][0] == 'result:  , 1 , 1 , aa , 2 , 2 , ba , 1 , 2 , ab' \
-                            or rows[6][0] == "result: 1.0 , 1.0 , u'aa' , 2.0 , 2.0 , u'ba' , 1.0 , 2.0 , u'ab' , " \
-                            or rows[9][0] == "result: 1 , 1 , aa , 2 , 2 , ba , 1 , 2 , ab , " \
-                            or rows[9][0] == "result: 1.0 , 1.0 , aa , 2.0 , 2.0 , ba , 1.0 , 2.0 , ab , " or rows[9][0] == "result: 1.0 , 1.0 , 'aa' , 2.0 , 2.0 , 'ba' , 1.0 , 2.0 , 'ab' , ")
-
-    def test_basic_set_return_constants(self):
-        rows = self.query('''
-            SELECT fn1.basic_set_return(cast(99 as double),'77','aaaa')
-            FROM DUAL
-            ''')
-        self.assertTrue(rows[0][0] == 'result:  , 99  , 77  , aaaa ' \
-                            or rows[0][0] == "result: 99.0 , u'77' , u'aaaa' , " \
-                            or rows[0][0] == "result: 99 , 77 , aaaa , " \
-                            or rows[0][0] == "result: 99.0 , 77 , aaaa , " or rows[0][0] == "result: 99.0 , '77' , 'aaaa' , ")
-
-    def test_basic_set_return(self):
-        rows = self.query('''
-            SELECT fn1.basic_set_return(n, v)
-            FROM dynamic_input.groupt GROUP BY id ORDER BY 1
-            ''')
-        self.assertTrue(rows[0][0] == 'result:  , 1  , aa  , 2  , ab ' \
-                            or rows[0][0] == "result: 1.0 , u'aa' , 2.0 , u'ab' , " \
-                            or rows[0][0] == "result: 1 , aa , 2 , ab , " \
-                            or rows[0][0] == "result: 1.0 , aa , 2.0 , ab , " or rows[0][0] == "result: 1.0 , 'aa' , 2.0 , 'ab' , ")
-        self.assertTrue(rows[1][0] == 'result:  , 2  , ba ' \
-                            or rows[1][0] == "result: 2.0 , u'ba' , " \
-                            or rows[1][0] == "result: 2 , ba , " \
-                            or rows [1][0] == "result: 2.0 , ba , " or rows [1][0] == "result: 2.0 , 'ba' , ")
-
-    def test_basic_set_return_one_group(self):
-        rows = self.query('''
-            SELECT fn1.basic_set_return(cast(id as double), n, v)
-            FROM dynamic_input.groupt
-            ''')
-        self.assertTrue(rows[0][0] == 'result:  , 1  , 1  , aa  , 2  , 2  , ba  , 1  , 2  , ab ' \
-                            or rows[0][0] == "result: 1.0 , 1.0 , u'aa' , 2.0 , 2.0 , u'ba' , 1.0 , 2.0 , u'ab' , " \
-                            or rows[0][0] == "result: 1 , 1 , aa , 2 , 2 , ba , 1 , 2 , ab , " \
-                            or rows[0][0] == "result: 1.0 , 1.0 , aa , 2.0 , 2.0 , ba , 1.0 , 2.0 , ab , " or rows[0][0] == "result: 1.0 , 1.0 , 'aa' , 2.0 , 2.0 , 'ba' , 1.0 , 2.0 , 'ab' , ")
-
-
-class DynamicInputDatatypeSpecific(_JavaUdfSetup):
-    def test_type_specific_add_string(self):
-        rows = self.query('''
-            SELECT fn1.type_specific_add(v, v, v)
-            FROM dynamic_input.groupt
-            ''')
-        self.assertTrue('result:  , aa , aa , aa , ba , ba , ba , ab , ab , ab' == rows[0][0] or 'result: aa , aa , aa , ba , ba , ba , ab , ab , ab , ' == rows[0][0])
-
-    def test_type_specific_add_number(self):
-        rows = self.query('''
-            SELECT fn1.type_specific_add(n,n,n,n,n,n,n,n,n,n)
-            FROM dynamic_input.groupt
-            ''')
-        self.assertTrue(rows[0][0] == 'result:  50' or rows[0][0] == "result: 50.0" or rows[0][0] == 'result: 50')
-
-
-class DynamicInputErrors(_JavaUdfSetup):
-    def test_exception_wrong_arg(self):
-        with self.assertRaisesRegex(Exception, 'does not exist'):
-            self.query('''select fn1.wrong_arg('a') from dual''')
-
-    def test_exception_wrong_operation(self):
-        with self.assertRaisesRegex(Exception, 'bad operand types for binary operator'):
-            self.query('''select fn1.wrong_operation('a','b') from dual''')
-
-    def test_exception_empty_set_returns(self):
-        with self.assertRaisesRegex(Exception, 'data exception - missing input parameters for SET UDF script'):
-            self.query('''select fn1.empty_set_returns() from dynamic_input.groupt''')
-
-    def test_exception_empty_set_emits(self):
-        with self.assertRaisesRegex(Exception, 'data exception - missing input parameters for SET UDF script'):
-            self.query('''select fn1.empty_set_emits() from dynamic_input.groupt''')
-
-class DynamicInputOptimizations(_JavaUdfSetup):
-    def test_mapreduce_optimization(self):
-        rows = self.query('''
-            select fn1.basic_set_return("v") from ( select fn1.basic_scalar_emit(n,n,n,n,n,n,n,n,n,n) from dynamic_input.groupt)
-            ''')
-        self.assertTrue(rows[0][0] == 'result:  , 1  , 1  , 1  , 1  , 1  , 1  , 1  , 1  , 1  , 1  , 2  , 2  , 2  , 2  , 2  , 2  , 2  , 2  , 2  , 2  , 2  , 2  , 2  , 2  , 2  , 2  , 2  , 2  , 2  , 2 ' \
-                            or rows[0][0] == "result: u'1.0' , u'1.0' , u'1.0' , u'1.0' , u'1.0' , u'1.0' , u'1.0' , u'1.0' , u'1.0' , u'1.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , u'2.0' , " \
-                            or rows[0][0] == "result: 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , " \
-                            or rows[0][0] == "result: 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , 2.0 , " or rows[0][0] == "result: '1.0' , '1.0' , '1.0' , '1.0' , '1.0' , '1.0' , '1.0' , '1.0' , '1.0' , '1.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , '2.0' , ")
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/generic/java/dynamic_output.py b/test_container/tests/test/generic/java/dynamic_output.py
deleted file mode 100644
index 4209e9a..0000000
--- a/test_container/tests/test/generic/java/dynamic_output.py
+++ /dev/null
@@ -1,899 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-
-
-class _JavaUdfSetup(udf.TestCase):
-
-    def _setup_fn1_schema(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-
-    def _setup_data(self):
-        self.query('DROP SCHEMA dynamic_output CASCADE', ignore_errors=True)
-        self.query('''drop connection SPOT4245''', ignore_errors=True)
-        self.query('CREATE SCHEMA dynamic_output')
-        self.query('CREATE TABLE dynamic_output.small(x VARCHAR(2000), y DOUBLE)')
-        self.query('''INSERT INTO dynamic_output.small VALUES ('Some string ... and some more', 2.2)''')
-        self.query('create table dynamic_output.groupt(id int, n double, v varchar(999))')
-        self.query('''insert into dynamic_output.groupt values (1,1,'aa'),
-                                                (1,2,'ab'),
-                                                (2,2,'ba')
-                                                ''')
-        self.query('create table dynamic_output.target (a int, b double, c varchar(100));')
-        self.query('''create connection SPOT4245 to 'a' user 'b' identified by 'c' ''')
-
-    def _create_all_udfs(self):
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT VAREMIT_SIMPLE_SET (a double) EMITS (...) AS
-            class VAREMIT_SIMPLE_SET {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(1.0);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT DEFAULT_VAREMIT_SIMPLE_SET (a double) EMITS (...) AS
-            class DEFAULT_VAREMIT_SIMPLE_SET {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(1.0);
-                }
-                static String getDefaultOutputColumns(ExaMetadata exa) {
-                    return "x double";
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT VAREMIT_SIMPLE_SCALAR (a double) EMITS (...) AS
-            class VAREMIT_SIMPLE_SCALAR {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(1.0);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT DEFAULT_VAREMIT_SIMPLE_SCALAR (a double) EMITS (...) AS
-            class DEFAULT_VAREMIT_SIMPLE_SCALAR {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(1.0);
-                }
-                static String getDefaultOutputColumns(ExaMetadata exa) {
-                    return "x double";
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT VAREMIT_SIMPLE_ALL_DYN (...) EMITS (...) AS
-            class VAREMIT_SIMPLE_ALL_DYN {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(1.0);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT DEFAULT_VAREMIT_SIMPLE_ALL_DYN (...) EMITS (...) AS
-            class DEFAULT_VAREMIT_SIMPLE_ALL_DYN {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(1.0);
-                }
-                static String getDefaultOutputColumns(ExaMetadata exa) {
-                    return "x double";
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT VAREMIT_SIMPLE_SYNTAX_VAR (...) EMITS ( ...   ) AS
-            class VAREMIT_SIMPLE_SYNTAX_VAR {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(1.0);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT DEFAULT_VAREMIT_SIMPLE_SYNTAX_VAR (...) EMITS ( ...   ) AS
-            class DEFAULT_VAREMIT_SIMPLE_SYNTAX_VAR {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(1.0);
-                }
-                static String getDefaultOutputColumns(ExaMetadata exa) {
-                    return "x double";
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT VAREMIT_GENERIC_EMIT (a varchar(100)) EMITS (...) AS
-            class VAREMIT_GENERIC_EMIT {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    String val = ctx.getString("a");
-                    int n = (int) exa.getOutputColumnCount();
-                    Object[] record = new Object[n];
-                    for (int i = 0; i < n; i++) {
-                        record[i] = val;
-                    }
-                    ctx.emit(record);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT DEFAULT_VAREMIT_GENERIC_EMIT (a varchar(100)) EMITS (...) AS
-            class DEFAULT_VAREMIT_GENERIC_EMIT {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    String val = ctx.getString("a");
-                    int n = (int) exa.getOutputColumnCount();
-                    Object[] record = new Object[n];
-                    for (int i = 0; i < n; i++) {
-                        record[i] = val;
-                    }
-                    ctx.emit(record);
-                }
-                static String getDefaultOutputColumns(ExaMetadata exa) {
-                    return "a varchar(100)";
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT VAREMIT_ALL_GENERIC (...) EMITS (...) AS
-            class VAREMIT_ALL_GENERIC {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    String val = ctx.getString(0);
-                    int n = (int) exa.getOutputColumnCount();
-                    Object[] record = new Object[n];
-                    for (int i = 0; i < n; i++) {
-                        record[i] = val;
-                    }
-                    ctx.emit(record);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT DEFAULT_VAREMIT_ALL_GENERIC (...) EMITS (...) AS
-            class DEFAULT_VAREMIT_ALL_GENERIC {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    String val = ctx.getString(0);
-                    int n = (int) exa.getOutputColumnCount();
-                    Object[] record = new Object[n];
-                    for (int i = 0; i < n; i++) {
-                        record[i] = val;
-                    }
-                    ctx.emit(record);
-                }
-                static String getDefaultOutputColumns(ExaMetadata exa) {
-                    return "a varchar(100)";
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT VAREMIT_METADATA_SET_EMIT (...) EMITS(...) AS
-            class VAREMIT_METADATA_SET_EMIT {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    long count = exa.getOutputColumnCount();
-                    ctx.emit(String.valueOf(count), 1.0);
-                    for (int i = 0; i < count; i++) {
-                        ctx.emit(exa.getOutputColumnName(i), 1.0);
-                        ctx.emit(exa.getOutputColumnType(i).getName(), 1.0);
-                        ctx.emit(exa.getOutputColumnSqlType(i), 1.0);
-                        ctx.emit(String.valueOf(exa.getOutputColumnPrecision(i)), 1.0);
-                        ctx.emit(String.valueOf(exa.getOutputColumnScale(i)), 1.0);
-                        ctx.emit(String.valueOf(exa.getOutputColumnLength(i)), 1.0);
-                    }
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT DEFAULT_VAREMIT_METADATA_SET_EMIT (...) EMITS(...) AS
-            class DEFAULT_VAREMIT_METADATA_SET_EMIT {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    long count = exa.getOutputColumnCount();
-                    ctx.emit(String.valueOf(count), 1.0);
-                    for (int i = 0; i < count; i++) {
-                        ctx.emit(exa.getOutputColumnName(i), 1.0);
-                        ctx.emit(exa.getOutputColumnType(i).getName(), 1.0);
-                        ctx.emit(exa.getOutputColumnSqlType(i), 1.0);
-                        ctx.emit(String.valueOf(exa.getOutputColumnPrecision(i)), 1.0);
-                        ctx.emit(String.valueOf(exa.getOutputColumnScale(i)), 1.0);
-                        ctx.emit(String.valueOf(exa.getOutputColumnLength(i)), 1.0);
-                    }
-                }
-                static String getDefaultOutputColumns(ExaMetadata exa) {
-                    return "a varchar(123), b double";
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT VAREMIT_NON_VAR_EMIT (...) EMITS (a double) AS
-            class VAREMIT_NON_VAR_EMIT {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(1.0);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT DEFAULT_VAREMIT_NON_VAR_EMIT (...) EMITS (a double) AS
-            class DEFAULT_VAREMIT_NON_VAR_EMIT {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(1.0);
-                }
-                static String getDefaultOutputColumns(ExaMetadata exa) {
-                    return "a int";
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT VAREMIT_SIMPLE_RETURNS (a int) RETURNS int AS
-            class VAREMIT_SIMPLE_RETURNS {
-                static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return 1L;
-                }
-                static String getDefaultOutputColumns(ExaMetadata exa) {
-                    return "x double";
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT DEFAULT_VAREMIT_SIMPLE_RETURNS (a int) RETURNS int AS
-            class DEFAULT_VAREMIT_SIMPLE_RETURNS {
-                static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return 1L;
-                }
-                static String getDefaultOutputColumns(ExaMetadata exa) {
-                    return "a int";
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT VAREMIT_EMIT_INPUT (...) EMITS (...) AS
-            import java.math.BigDecimal;
-            import java.sql.Date;
-            import java.sql.Timestamp;
-            class VAREMIT_EMIT_INPUT {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int n = (int) exa.getInputColumnCount();
-                    Object[] record = new Object[n];
-                    for (int i = 0; i < n; i++) {
-                        Class cls = exa.getInputColumnType(i);
-                        if (cls == Integer.class) record[i] = ctx.getInteger(i);
-                        else if (cls == Long.class) record[i] = ctx.getLong(i);
-                        else if (cls == Double.class) record[i] = ctx.getDouble(i);
-                        else if (cls == String.class) record[i] = ctx.getString(i);
-                        else if (cls == Boolean.class) record[i] = ctx.getBoolean(i);
-                        else if (cls == BigDecimal.class) record[i] = ctx.getBigDecimal(i);
-                        else if (cls == Date.class) record[i] = ctx.getDate(i);
-                        else if (cls == Timestamp.class) record[i] = ctx.getTimestamp(i);
-                    }
-                    ctx.emit(record);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT DEFAULT_VAREMIT_EMIT_INPUT (...) EMITS (...) AS
-            import java.math.BigDecimal;
-            import java.sql.Date;
-            import java.sql.Timestamp;
-            class DEFAULT_VAREMIT_EMIT_INPUT {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int n = (int) exa.getInputColumnCount();
-                    Object[] record = new Object[n];
-                    for (int i = 0; i < n; i++) {
-                        Class cls = exa.getInputColumnType(i);
-                        if (cls == Integer.class) record[i] = ctx.getInteger(i);
-                        else if (cls == Long.class) record[i] = ctx.getLong(i);
-                        else if (cls == Double.class) record[i] = ctx.getDouble(i);
-                        else if (cls == String.class) record[i] = ctx.getString(i);
-                        else if (cls == Boolean.class) record[i] = ctx.getBoolean(i);
-                        else if (cls == BigDecimal.class) record[i] = ctx.getBigDecimal(i);
-                        else if (cls == Date.class) record[i] = ctx.getDate(i);
-                        else if (cls == Timestamp.class) record[i] = ctx.getTimestamp(i);
-                    }
-                    ctx.emit(record);
-                }
-                static String getDefaultOutputColumns(ExaMetadata exa) {
-                    return "a int";
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT VAREMIT_EMIT_INPUT_WITH_META_CHECK (...) EMITS (...) AS
-            import java.math.BigDecimal;
-            import java.sql.Date;
-            import java.sql.Timestamp;
-            class VAREMIT_EMIT_INPUT_WITH_META_CHECK {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int n = (int) exa.getInputColumnCount();
-                    Object[] record = new Object[n];
-                    for (int i = 0; i < n; i++) {
-                        if (!exa.getInputColumnSqlType(i).equals(exa.getOutputColumnSqlType(i))) {
-                            throw new Exception("Input/output SQL type mismatch at column " + i);
-                        }
-                        Class cls = exa.getInputColumnType(i);
-                        if (cls == Integer.class) record[i] = ctx.getInteger(i);
-                        else if (cls == Long.class) record[i] = ctx.getLong(i);
-                        else if (cls == Double.class) record[i] = ctx.getDouble(i);
-                        else if (cls == String.class) record[i] = ctx.getString(i);
-                        else if (cls == Boolean.class) record[i] = ctx.getBoolean(i);
-                        else if (cls == BigDecimal.class) record[i] = ctx.getBigDecimal(i);
-                        else if (cls == Date.class) record[i] = ctx.getDate(i);
-                        else if (cls == Timestamp.class) record[i] = ctx.getTimestamp(i);
-                    }
-                    ctx.emit(record);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT DEFAULT_VAREMIT_EMIT_INPUT_WITH_META_CHECK (...) EMITS (...) AS
-            import java.math.BigDecimal;
-            import java.sql.Date;
-            import java.sql.Timestamp;
-            class DEFAULT_VAREMIT_EMIT_INPUT_WITH_META_CHECK {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int n = (int) exa.getInputColumnCount();
-                    Object[] record = new Object[n];
-                    for (int i = 0; i < n; i++) {
-                        if (!exa.getInputColumnSqlType(i).equals(exa.getOutputColumnSqlType(i))) {
-                            throw new Exception("Input/output SQL type mismatch at column " + i);
-                        }
-                        Class cls = exa.getInputColumnType(i);
-                        if (cls == Integer.class) record[i] = ctx.getInteger(i);
-                        else if (cls == Long.class) record[i] = ctx.getLong(i);
-                        else if (cls == Double.class) record[i] = ctx.getDouble(i);
-                        else if (cls == String.class) record[i] = ctx.getString(i);
-                        else if (cls == Boolean.class) record[i] = ctx.getBoolean(i);
-                        else if (cls == BigDecimal.class) record[i] = ctx.getBigDecimal(i);
-                        else if (cls == Date.class) record[i] = ctx.getDate(i);
-                        else if (cls == Timestamp.class) record[i] = ctx.getTimestamp(i);
-                    }
-                    ctx.emit(record);
-                }
-                static String getDefaultOutputColumns(ExaMetadata exa) {
-                    return "a varchar(123), b double";
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT DEFAULT_VAREMIT_EMPTY_DEF(X DOUBLE) EMITS (...) AS
-            class DEFAULT_VAREMIT_EMPTY_DEF {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(1.4);
-                }
-                static String getDefaultOutputColumns(ExaMetadata exa) {
-                    return "";
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT COPY_RELATION (...) EMITS (...) AS
-            import java.math.BigDecimal;
-            import java.sql.Date;
-            import java.sql.Timestamp;
-            class COPY_RELATION {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int n = (int) exa.getInputColumnCount();
-                    Object[] record = new Object[n];
-                    for (int i = 0; i < n; i++) {
-                        if (!exa.getInputColumnSqlType(i).equals(exa.getOutputColumnSqlType(i))) {
-                            throw new Exception("Input/output SQL type mismatch at column " + i);
-                        }
-                        Class cls = exa.getInputColumnType(i);
-                        if (cls == Integer.class) record[i] = ctx.getInteger(i);
-                        else if (cls == Long.class) record[i] = ctx.getLong(i);
-                        else if (cls == Double.class) record[i] = ctx.getDouble(i);
-                        else if (cls == String.class) record[i] = ctx.getString(i);
-                        else if (cls == Boolean.class) record[i] = ctx.getBoolean(i);
-                        else if (cls == BigDecimal.class) record[i] = ctx.getBigDecimal(i);
-                        else if (cls == Date.class) record[i] = ctx.getDate(i);
-                        else if (cls == Timestamp.class) record[i] = ctx.getTimestamp(i);
-                    }
-                    ctx.emit(record);
-                }
-                static String getDefaultOutputColumns(ExaMetadata exa) throws Exception {
-                    StringBuilder sb = new StringBuilder();
-                    for (int i = 0; i < exa.getInputColumnCount(); i++) {
-                        if (i > 0) sb.append(", ");
-                        String colName = exa.getInputColumnName(i);
-                        try {
-                            int idx = Integer.parseInt(colName);
-                            colName = "col_" + idx;
-                        } catch (NumberFormatException e) {}
-                        sb.append(colName).append(" ").append(exa.getInputColumnSqlType(i));
-                    }
-                    return sb.toString();
-                }
-            }
-            /
-        '''))
-
-    def setUp(self):
-        self._setup_fn1_schema()
-        self._setup_data()
-        self.query('OPEN SCHEMA FN1')
-        self._create_all_udfs()
-
-
-class DynamicOutputCreateScript(_JavaUdfSetup):
-
-    def test_create_script_set(self):
-        rows = self.query('''
-            select count(*) from exa_all_scripts where script_name='VAREMIT_SIMPLE_SET' and SCRIPT_TEXT LIKE 'CREATE % SET SCRIPT "VAREMIT_SIMPLE_SET" ("a" DOUBLE) EMITS (...) AS%';
-            ''')
-        self.assertRowEqual((1,), rows[0])
-
-    def test_create_script_scalar(self):
-        rows = self.query('''
-            select count(*) from exa_all_scripts where script_name='VAREMIT_SIMPLE_SCALAR' and SCRIPT_TEXT LIKE 'CREATE % SCALAR SCRIPT "VAREMIT_SIMPLE_SCALAR" ("a" DOUBLE) EMITS (...) AS%';
-            ''')
-        self.assertRowEqual((1,), rows[0])
-
-    def test_create_script_all_dyn(self):
-        rows = self.query('''
-            select count(*) from exa_all_scripts where script_name='VAREMIT_SIMPLE_ALL_DYN' and SCRIPT_TEXT LIKE 'CREATE % SCALAR SCRIPT "VAREMIT_SIMPLE_ALL_DYN" (...) EMITS (...) AS%';
-            ''')
-        self.assertRowEqual((1,), rows[0])
-
-    def test_create_script_syntax_var(self):
-        rows = self.query('''
-            select count(*) from exa_all_scripts where script_name='VAREMIT_SIMPLE_SYNTAX_VAR' and SCRIPT_TEXT LIKE 'CREATE % SET SCRIPT "VAREMIT_SIMPLE_SYNTAX_VAR" (...) EMITS (...) AS%';
-            ''')
-        self.assertRowEqual((1,), rows[0])
-
-
-class DynamicOutputTest(_JavaUdfSetup):
-
-    def test_generic_emit(self):
-        rows = self.query('''
-            SELECT fn1.VAREMIT_GENERIC_EMIT('SUPERDYNAMIC') EMITS (a varchar(100));
-            ''')
-        self.assertRowEqual(('SUPERDYNAMIC',), rows[0])
-
-    def test_all_generic(self):
-        rows = self.query('''
-            SELECT fn1.VAREMIT_ALL_GENERIC('SUPERDYNAMIC') EMITS (a varchar(100));
-            ''')
-        self.assertRowEqual(('SUPERDYNAMIC',), rows[0])
-
-    def test_correctness_emits_subquery(self):
-        rows = self.query('''
-            SELECT "A" || 'x' || "B" FROM (
-            SELECT fn1.VAREMIT_GENERIC_EMIT('SUPERDYNAMIC') EMITS (a varchar(100), b varchar(100)));
-            ''')
-        self.assertRowEqual(('SUPERDYNAMICxSUPERDYNAMIC',), rows[0])
-
-    def test_correctness_emits_with_grouping(self):
-        rows = self.query('''
-            SELECT 'X' || count(a) || 'X' FROM (
-             SELECT fn1.VAREMIT_GENERIC_EMIT('SUPERDYNAMIC') EMITS (a varchar(100))
-             FROM dynamic_output.groupt GROUP BY id
-            ) where a = 'SUPERDYNAMIC';
-            ''')
-        self.assertRowEqual(('X2X',), rows[0])
-
-    def test_correctness_nested(self):
-        rows = self.query('''
-            SELECT fn1.VAREMIT_GENERIC_EMIT(c || 'D') EMITS (d varchar(100)) FROM (
-              SELECT fn1.VAREMIT_GENERIC_EMIT(b || 'C') EMITS (c varchar(100)) FROM (
-                SELECT fn1.VAREMIT_GENERIC_EMIT(a || 'B') EMITS(b varchar(100)) FROM (
-                  SELECT fn1.VAREMIT_GENERIC_EMIT('A') EMITS (a varchar(100))
-                )
-              )
-            );
-            ''')
-        self.assertRowEqual(('ABCD',), rows[0])
-
-    def test_metadata_correctness(self):
-        rows = self.query('''
-            SELECT fn1.VAREMIT_METADATA_SET_EMIT(1) EMITS (a varchar(123), b double)
-            FROM DUAL
-            ''')
-        self.assertRowEqual(('2', 1.0), rows[0])
-        self.assertRowEqual(('A', 1.0), rows[1])
-        self.assertTrue(rows[2][0] in ["java.lang.String"])
-        self.assertRowEqual(('VARCHAR(123) UTF8', 1), rows[3])
-        self.assertRowEqual(('123', 1.0), rows[6])
-        self.assertRowEqual(('B', 1.0), rows[7])
-        self.assertTrue(rows[8][0] in ["java.lang.Double"])
-        self.assertRowEqual(('DOUBLE', 1.0), rows[9])
-
-
-class DynamicOutputWrongUsage(_JavaUdfSetup):
-
-    def test_error_emit_missing(self):
-        with self.assertRaisesRegex(Exception, 'The script has dynamic return arguments. Either specify the return arguments in the query via EMITS or implement the method'):
-            self.query('''SELECT fn1.VAREMIT_GENERIC_EMIT(1)''')
-
-    def test_error_empty_emit(self):
-        with self.assertRaisesRegex(Exception, 'Empty return argument definition is not allowed'):
-            self.query('''SELECT fn1.VAREMIT_GENERIC_EMIT(1) EMITS ();''')
-
-    def test_error_empty_emit_2(self):
-        with self.assertRaisesRegex(Exception, 'syntax error'):
-            self.query('''SELECT fn1.VAREMIT_GENERIC_EMIT(1) EMITS (a);''')
-
-    def test_error_wrong_emit(self):
-        with self.assertRaisesRegex(Exception, 'syntax error'):
-            self.query('''SELECT fn1.VAREMIT_GENERIC_EMIT(1) EMITS (int);''')
-
-    def test_error_redundant_name(self):
-        with self.assertRaisesRegex(Exception, 'Return argument A is declared more than once'):
-            self.query('''SELECT fn1.VAREMIT_GENERIC_EMIT(1) EMITS (a int, b int, a int);''')
-
-    def test_error_non_var_emit(self):
-        with self.assertRaisesRegex(Exception, 'The script has a static return argument definition. Dynamic return arguments are not supported in this case'):
-            self.query('''SELECT fn1.VAREMIT_NON_VAR_EMIT(1) EMITS (a double);''')
-
-    def test_error_non_var_emit_2(self):
-        with self.assertRaisesRegex(Exception, 'The script has a static return argument definition. Dynamic return arguments are not supported in this case'):
-            self.query('''SELECT fn1.VAREMIT_NON_VAR_EMIT(1) EMITS ();''')
-
-    def test_error_returns_not_supported(self):
-        with self.assertRaisesRegex(Exception, 'The script has a static return argument definition. Dynamic return arguments are not supported in this case'):
-            self.query('''select fn1.VAREMIT_SIMPLE_RETURNS(1) EMITS (a INT);''')
-
-    def test_error_built_in_set_not_supported(self):
-        with self.assertRaisesRegex(Exception, 'emits specification is not allowed for built-in functions'):
-            self.query('''SELECT AVG(a) EMITS(a int) FROM dynamic_output.small;''')
-
-    def test_error_built_in_scalar_not_supported(self):
-        with self.assertRaisesRegex(Exception, 'emits specification is not allowed for built-in functions'):
-            self.query('''SELECT -ABS(a) EMITS(a int) FROM dynamic_output.small;''')
-
-
-class DynamicOutputInsertInto(_JavaUdfSetup):
-
-    def test_insert_basic(self):
-        self.query('''delete from dynamic_output.target;''')
-        self.query('''
-            insert into dynamic_output.target select fn1.VAREMIT_EMIT_INPUT(1, CAST (1.1 AS DOUBLE), 'a');
-            ''')
-        rows = self.query('''
-            select * from dynamic_output.target;
-            ''')
-        self.assertRowEqual((1, 1.1, 'a'), rows[0])
-        self.query('''delete from dynamic_output.target;''')
-
-    def test_insert_metadata_correctness(self):
-        self.query('''
-            insert into dynamic_output.target select fn1.VAREMIT_EMIT_INPUT_WITH_META_CHECK(cast (2 as int), CAST (2.2 AS DOUBLE), cast ('b' as varchar(100)));
-            ''')
-        rows = self.query('''
-            select * from dynamic_output.target;
-            ''')
-        self.assertRowEqual((2, 2.2, 'b'), rows[0])
-        self.query('''delete from dynamic_output.target;''')
-
-    def test_insert_target_columns_change_order(self):
-        self.query('''
-            insert into dynamic_output.target (c, b, a) select fn1.VAREMIT_EMIT_INPUT('c', CAST (3.3 AS DOUBLE), 3);
-            ''')
-        rows = self.query('''
-            select * from dynamic_output.target;
-            ''')
-        self.assertRowEqual((3, 3.3, 'c'), rows[0])
-        self.query('''delete from dynamic_output.target;''')
-
-    def test_insert_target_columns_subset(self):
-        self.query('''
-            insert into dynamic_output.target (b) select fn1.VAREMIT_EMIT_INPUT(CAST (4.4 AS DOUBLE));
-            ''')
-        rows = self.query('''
-            select * from dynamic_output.target;
-            ''')
-        self.assertRowEqual((None, 4.4, None), rows[0])
-        self.query('''delete from dynamic_output.target;''')
-
-    def test_insert_emits_not_allowed(self):
-        with self.assertRaisesRegex(Exception, 'The return arguments for EMITS functions are inferred from the table to insert into. Specification of EMITS is not allowed in this case.'):
-            self.query('''insert into dynamic_output.target select FN1.VAREMIT_EMIT_INPUT(1) emits (a int);''')
-
-
-class DynamicOutputCreateTableAs(_JavaUdfSetup):
-
-    def test_insert_basic(self):
-        self.query('''drop table if exists dynamic_output.targetcreated;''')
-        self.query('''
-            create table dynamic_output.targetcreated as select fn1.VAREMIT_EMIT_INPUT(1, CAST (1.1 AS DOUBLE), 'a') emits (a decimal(20,0), b double, c varchar(100));
-            ''')
-        rows = self.query('''
-            select * from dynamic_output.targetcreated;
-            ''')
-        self.assertRowEqual((1, 1.1, 'a'), rows[0])
-        rows = self.query('''
-            describe dynamic_output.targetcreated;
-            ''')
-        self.assertRowEqual(('A', 'DECIMAL(20,0)'), rows[0][0:2])
-        self.assertRowEqual(('B', 'DOUBLE'), rows[1][0:2])
-        self.assertRowEqual(('C', 'VARCHAR(100) UTF8'), rows[2][0:2])
-
-
-## #####################################################
-## The same as above but now with default output columns
-## #####################################################
-
-class DynamicOutputUDFsExistInExaAllScripts(_JavaUdfSetup):
-
-    def test_create_script_set(self):
-        rows = self.query('''
-            select count(*) from exa_all_scripts where script_name='DEFAULT_VAREMIT_SIMPLE_SET' and SCRIPT_TEXT LIKE 'CREATE % SET SCRIPT "DEFAULT_VAREMIT_SIMPLE_SET" ("a" DOUBLE) EMITS (...) AS%';
-            ''')
-        self.assertRowEqual((1,), rows[0])
-
-    def test_create_script_scalar(self):
-        rows = self.query('''
-            select count(*) from exa_all_scripts where script_name='DEFAULT_VAREMIT_SIMPLE_SCALAR' and SCRIPT_TEXT LIKE 'CREATE % SCALAR SCRIPT "DEFAULT_VAREMIT_SIMPLE_SCALAR" ("a" DOUBLE) EMITS (...) AS%';
-            ''')
-        self.assertRowEqual((1,), rows[0])
-
-    def test_create_script_all_dyn(self):
-        rows = self.query('''
-            select count(*) from exa_all_scripts where script_name='DEFAULT_VAREMIT_SIMPLE_ALL_DYN' and SCRIPT_TEXT LIKE 'CREATE % SCALAR SCRIPT "DEFAULT_VAREMIT_SIMPLE_ALL_DYN" (...) EMITS (...) AS%';
-            ''')
-        self.assertRowEqual((1,), rows[0])
-
-    def test_create_script_syntax_var(self):
-        rows = self.query('''
-            select count(*) from exa_all_scripts where script_name='DEFAULT_VAREMIT_SIMPLE_SYNTAX_VAR' and SCRIPT_TEXT LIKE 'CREATE % SET SCRIPT "DEFAULT_VAREMIT_SIMPLE_SYNTAX_VAR" (...) EMITS (...) AS%';
-            ''')
-        self.assertRowEqual((1,), rows[0])
-
-
-class DefaultDynamicOutputTest(_JavaUdfSetup):
-
-    def test_generic_emit(self):
-        rows = self.query('''
-            SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT('SUPERDYNAMIC') EMITS (a varchar(100));
-            ''')
-        self.assertRowEqual(('SUPERDYNAMIC',), rows[0])
-        rows = self.query('''
-            SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT('SUPERDYNAMIC');
-            ''')
-        self.assertRowEqual(('SUPERDYNAMIC',), rows[0])
-
-    def test_all_generic(self):
-        rows = self.query('''
-            SELECT fn1.DEFAULT_VAREMIT_ALL_GENERIC('SUPERDYNAMIC') EMITS (a varchar(100));
-            ''')
-        self.assertRowEqual(('SUPERDYNAMIC',), rows[0])
-        rows = self.query('''
-            SELECT fn1.DEFAULT_VAREMIT_ALL_GENERIC('SUPERDYNAMIC');
-            ''')
-        self.assertRowEqual(('SUPERDYNAMIC',), rows[0])
-
-    def test_correctness_emits_subquery(self):
-        rows = self.query('''
-            SELECT "A" || 'x' || "B" FROM (
-            SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT('SUPERDYNAMIC') EMITS (a varchar(100), b varchar(100)));
-            ''')
-        self.assertRowEqual(('SUPERDYNAMICxSUPERDYNAMIC',), rows[0])
-        rows = self.query('''
-            SELECT "A" || 'x' || "A" FROM (
-            SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT('SUPERDYNAMIC'));
-            ''')
-        self.assertRowEqual(('SUPERDYNAMICxSUPERDYNAMIC',), rows[0])
-
-    def test_correctness_emits_with_grouping(self):
-        rows = self.query('''
-            SELECT 'X' || count(a) || 'X' FROM (
-             SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT('SUPERDYNAMIC') EMITS (a varchar(100))
-             FROM dynamic_output.groupt GROUP BY id
-            ) where a = 'SUPERDYNAMIC';
-            ''')
-        self.assertRowEqual(('X2X',), rows[0])
-        rows = self.query('''
-            SELECT 'X' || count(a) || 'X' FROM (
-             SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT('SUPERDYNAMIC')
-             FROM dynamic_output.groupt GROUP BY id
-            ) where a = 'SUPERDYNAMIC';
-            ''')
-        self.assertRowEqual(('X2X',), rows[0])
-
-    def test_correctness_nested(self):
-        rows = self.query('''
-            SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT(c || 'D') EMITS (d varchar(100)) FROM (
-              SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT(b || 'C') EMITS (c varchar(100)) FROM (
-                SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT(a || 'B') EMITS(b varchar(100)) FROM (
-                  SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT('A') EMITS (a varchar(100))
-                )
-              )
-            );
-            ''')
-        self.assertRowEqual(('ABCD',), rows[0])
-        rows = self.query('''
-            SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT(a || 'D') FROM (
-              SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT(a || 'C') FROM (
-                SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT(a || 'B') FROM (
-                  SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT('A')
-                )
-              )
-            );
-            ''')
-        self.assertRowEqual(('ABCD',), rows[0])
-
-    def test_metadata_correctness(self):
-        rows = self.query('''
-            SELECT fn1.DEFAULT_VAREMIT_METADATA_SET_EMIT(1) EMITS (a varchar(123), b double)
-            FROM DUAL
-            ''')
-        self.assertRowEqual(('2', 1.0), rows[0])
-        self.assertRowEqual(('A', 1.0), rows[1])
-        self.assertTrue(rows[2][0] in ["java.lang.String"])
-        self.assertRowEqual(('VARCHAR(123) UTF8', 1), rows[3])
-        self.assertRowEqual(('123', 1.0), rows[6])
-        self.assertRowEqual(('B', 1.0), rows[7])
-        self.assertTrue(rows[8][0] in ["java.lang.Double"])
-        self.assertRowEqual(('DOUBLE', 1.0), rows[9])
-        # now again with intrinsic emits clause
-        rows = self.query('''
-            SELECT fn1.DEFAULT_VAREMIT_METADATA_SET_EMIT(1)
-            FROM DUAL
-            ''')
-        self.assertRowEqual(('2', 1.0), rows[0])
-        self.assertRowEqual(('A', 1.0), rows[1])
-        self.assertTrue(rows[2][0] in ["java.lang.String"])
-        self.assertRowEqual(('VARCHAR(123) UTF8', 1), rows[3])
-        self.assertRowEqual(('123', 1.0), rows[6])
-        self.assertRowEqual(('B', 1.0), rows[7])
-        self.assertTrue(rows[8][0] in ["java.lang.Double"])
-        self.assertRowEqual(('DOUBLE', 1.0), rows[9])
-
-
-class DefaultDynamicOutputWrongUsage(_JavaUdfSetup):
-
-    def test_error_empty_emit(self):
-        with self.assertRaisesRegex(Exception, 'Empty return argument definition is not allowed'):
-            self.query('''SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT(1) EMITS ();''')
-
-    def test_error_empty_emit_2(self):
-        with self.assertRaisesRegex(Exception, 'syntax error'):
-            self.query('''SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT(1) EMITS (a);''')
-
-    def test_error_wrong_emit(self):
-        with self.assertRaisesRegex(Exception, 'syntax error'):
-            self.query('''SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT(1) EMITS (int);''')
-
-    def test_error_redundant_name(self):
-        with self.assertRaisesRegex(Exception, 'Return argument A is declared more than once'):
-            self.query('''SELECT fn1.DEFAULT_VAREMIT_GENERIC_EMIT(1) EMITS (a int, b int, a int);''')
-
-    def test_error_non_var_emit(self):
-        with self.assertRaisesRegex(Exception, 'The script has a static return argument definition. Dynamic return arguments are not supported in this case'):
-            self.query('''SELECT fn1.DEFAULT_VAREMIT_NON_VAR_EMIT(1) EMITS (a double);''')
-
-    def test_error_non_var_emit_2(self):
-        with self.assertRaisesRegex(Exception, 'The script has a static return argument definition. Dynamic return arguments are not supported in this case'):
-            self.query('''SELECT fn1.DEFAULT_VAREMIT_NON_VAR_EMIT(1) EMITS ();''')
-
-    def test_error_returns_not_supported(self):
-        with self.assertRaisesRegex(Exception, 'The script has a static return argument definition. Dynamic return arguments are not supported in this case'):
-            self.query('''select fn1.DEFAULT_VAREMIT_SIMPLE_RETURNS(1) EMITS (a INT);''')
-
-
-class DefaultDynamicOutputInsertInto(_JavaUdfSetup):
-
-    def test_insert_basic(self):
-        self.query('''delete from dynamic_output.target;''')
-        self.query('''
-            insert into dynamic_output.target select fn1.DEFAULT_VAREMIT_EMIT_INPUT(1, CAST (1.1 AS DOUBLE), 'a');
-            ''')
-        rows = self.query('''
-            select * from dynamic_output.target;
-            ''')
-        self.assertRowEqual((1, 1.1, 'a'), rows[0])
-        self.query('''delete from dynamic_output.target;''')
-
-    def test_insert_metadata_correctness(self):
-        self.query('''
-            insert into dynamic_output.target select fn1.DEFAULT_VAREMIT_EMIT_INPUT_WITH_META_CHECK(cast (2 as int), CAST (2.2 AS DOUBLE), cast ('b' as varchar(100)));
-            ''')
-        rows = self.query('''
-            select * from dynamic_output.target;
-            ''')
-        self.assertRowEqual((2, 2.2, 'b'), rows[0])
-        self.query('''delete from dynamic_output.target;''')
-
-    def test_insert_target_columns_change_order(self):
-        self.query('''
-            insert into dynamic_output.target (c, b, a) select fn1.DEFAULT_VAREMIT_EMIT_INPUT('c', CAST (3.3 AS DOUBLE), 3);
-            ''')
-        rows = self.query('''
-            select * from dynamic_output.target;
-            ''')
-        self.assertRowEqual((3, 3.3, 'c'), rows[0])
-        self.query('''delete from dynamic_output.target;''')
-
-    def test_insert_target_columns_subset(self):
-        self.query('''
-            insert into dynamic_output.target (b) select fn1.DEFAULT_VAREMIT_EMIT_INPUT(CAST (4.4 AS DOUBLE));
-            ''')
-        rows = self.query('''
-            select * from dynamic_output.target;
-            ''')
-        self.assertRowEqual((None, 4.4, None), rows[0])
-        self.query('''delete from dynamic_output.target;''')
-
-    def test_insert_emits_not_allowed(self):
-        with self.assertRaisesRegex(Exception, 'The return arguments for EMITS functions are inferred from the table to insert into. Specification of EMITS is not allowed in this case.'):
-            self.query('''insert into dynamic_output.target select FN1.DEFAULT_VAREMIT_EMIT_INPUT(1) emits (a int);''')
-
-
-class DefaultDynamicOutputCreateTableAs(_JavaUdfSetup):
-
-    def test_insert_basic(self):
-        self.query('''drop table if exists dynamic_output.targetcreated;''')
-        self.query('''
-            create table dynamic_output.targetcreated as select fn1.DEFAULT_VAREMIT_EMIT_INPUT(1, CAST (1.1 AS DOUBLE), 'a') emits (a decimal(20,0), b double, c varchar(100));
-            ''')
-        rows = self.query('''
-            select * from dynamic_output.targetcreated;
-            ''')
-        self.assertRowEqual((1, 1.1, 'a'), rows[0])
-        rows = self.query('''
-            describe dynamic_output.targetcreated;
-            ''')
-        self.assertRowEqual(('A', 'DECIMAL(20,0)'), rows[0][0:2])
-        self.assertRowEqual(('B', 'DOUBLE'), rows[1][0:2])
-        self.assertRowEqual(('C', 'VARCHAR(100) UTF8'), rows[2][0:2])
-
-
-class DefaultDynamicOutputEmptyStringResult(_JavaUdfSetup):
-
-    def test_empty_string_error(self):
-        with self.assertRaisesRegex(Exception, 'Empty default output columns'):
-            self.query('''select fn1.DEFAULT_VAREMIT_EMPTY_DEF(42.42);''')
-        rows = self.query('''select fn1.DEFAULT_VAREMIT_EMPTY_DEF(42.42) emits (x double);''')
-        self.assertRowEqual((1.4,), rows[0])
-
-
-class DefaultDynamicOutputFromInputMeta(_JavaUdfSetup):
-
-    def test_copy_relation(self):
-        rows = self.query('''
-            select fn1.copy_relation(1,2,3);
-            ''')
-        self.assertRowEqual((1, 2, 3), rows[0])
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/generic/java/emit.py b/test_container/tests/test/generic/java/emit.py
deleted file mode 100644
index 789d939..0000000
--- a/test_container/tests/test/generic/java/emit.py
+++ /dev/null
@@ -1,537 +0,0 @@
-#!/usr/bin/env python3
-
-import datetime
-
-from exasol_python_test_framework import udf
-
-
-class _JavaUdfSetup(udf.TestCase):
-    def _setup_fn1_schema(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-        self.query('OPEN SCHEMA FN1')
-
-    def _create_emit_udfs(self):
-        self.query(udf.fixindent('''
-            create java scalar script dob_1i_1o(x double) emits(y double)
-            as
-            class DOB_1I_1O{
-                    static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                ctx.emit(ctx.getDouble("x"));
-                    ctx.emit(ctx.getDouble("x"));
-                    }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script line_1i_1o(x double) emits(y double)
-            as
-            class LINE_1I_1O{
-                    static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                ctx.emit(ctx.getDouble("x"));
-                    }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script line_1i_2o(x double) emits(y double, z double)
-            as
-            class LINE_1I_2O{
-                    static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                ctx.emit(ctx.getDouble("x"),ctx.getDouble("x"));
-                    }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script line_2i_1o(x double, y double) emits(z double)
-            as
-            class LINE_2I_1O{
-                    static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                ctx.emit(ctx.getDouble("x")+ctx.getDouble("y"));
-                    }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script line_3i_2o(x double, y double, z double) emits(z1 double, z2 double)
-            as
-            class LINE_3I_2O{
-                    static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                ctx.emit(ctx.getDouble("x")+ctx.getDouble("y"),3000);
-                    }
-            }
-            /
-        '''))
-
-    def setUp(self):
-        self._setup_fn1_schema()
-        self._create_emit_udfs()
-
-class InputOutputMatchingTest(_JavaUdfSetup):
-    def setUp(self):
-        self._setup_fn1_schema()
-        self._create_emit_udfs()
-        
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-        self.query('create table fn2.t(id double, x double)')
-        self.query('insert into fn2.t values (100,1),(100,2),(200,3)')
-
-    def test_iomatch_1i_1o(self):
-        rows = self.query('''
-            select x*2, fn1.line_1i_1o(x), x*3
-            FROM fn2.t
-            ''')
-        self.assertRowsEqual(sorted([(2,1,3,), (6,3,9,), (4,2,6,)]), sorted(rows))
-
-    def test_iomatch_1i_2o(self):
-        rows = self.query('''
-            select x*2, fn1.line_1i_2o(x), x*3
-            FROM fn2.t
-            ''')
-        self.assertRowsEqual(sorted([(2,1,1,3,), (6,3,3,9,), (4,2,2,6,)]), sorted(rows))
-
-    def test_iomatch_2i_1o(self):
-        rows = self.query('''
-            select x*2, fn1.line_2i_1o(x,id), x*3
-            FROM fn2.t
-            ''')
-        self.assertRowsEqual(sorted([(2,101,3,), (6,203,9,), (4,102,6,)]), sorted(rows))
-
-    def test_iomatch_3i_2o(self):
-        rows = self.query('''
-            select x*2, fn1.line_3i_2o(x,id,id), x*3
-            FROM fn2.t
-            ''')
-        self.assertRowsEqual(sorted([(2,101,3000,3,), (6,203,3000,9,), (4,102,3000,6,)]), sorted(rows))
-
-    def test_iomatch_dob_1i_1o(self):
-        rows = self.query('''
-            select x*2, fn1.dob_1i_1o(x), x*3
-            FROM fn2.t
-            ''')
-        self.assertRowsEqual(sorted([(2,1,3,), (2,1,3,), (6,3,9,), (6,3,9,), (4,2,6,),  (4,2,6,)]), sorted(rows))
-
-
-class ColumnNamesTest(_JavaUdfSetup):
-    def setUp(self):
-        self._setup_fn1_schema()
-        self._create_emit_udfs()
-        
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-        self.query('create table fn2.t(id double, x double)')
-        self.query('insert into fn2.t values (100,1),(100,2),(200,3)')
-
-    def test_col_names(self):
-        self.query('''
-            create or replace table fn2.foo as select x*2 a, fn1.line_3i_2o(x,id,id), x*3 b
-            FROM fn2.t
-            ''')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('A',rows[0][0])
-        self.assertEqual('Z1',rows[1][0])
-        self.assertEqual('Z2',rows[2][0])
-        self.assertEqual('B',rows[3][0])
-
-
-class DatatypesTest(_JavaUdfSetup):
-    def setUp(self):
-        self._setup_fn1_schema()
-        self._create_emit_udfs()
-        
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-
-    def test_boolean(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x BOOLEAN)')
-        self.query('insert into fn2.dt values false')
-        rows = self.query('''
-            select x, fn1.line_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(False,0,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('BOOLEAN', rows[0][1])
-
-    def test_double(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x DOUBLE)')
-        self.query('insert into fn2.dt values 32768e100')
-        rows = self.query('''
-            select x, fn1.line_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(3.2768e+104,0,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('DOUBLE', rows[0][1])
-
-    def test_dec_32bit(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x DECIMAL(9,0))')
-        self.query('insert into fn2.dt values 32768')
-        rows = self.query('''
-            select x, fn1.line_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(32768,0,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('DECIMAL(9,0)', rows[0][1])
-
-    def test_dec_64bit(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x DECIMAL(18,0))')
-        self.query('insert into fn2.dt values 32768')
-        rows = self.query('''
-            select x, fn1.line_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(32768,0,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('DECIMAL(18,0)', rows[0][1])
-
-    def test_dec_128bit(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x DECIMAL(36,0))')
-        self.query('insert into fn2.dt values 32768')
-        rows = self.query('''
-            select x, fn1.line_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(32768,0,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('DECIMAL(36,0)', rows[0][1])
-
-    def test_dec_32bit_with_scale(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x DECIMAL(9,1))')
-        self.query('insert into fn2.dt values 99999999.1')
-        rows = self.query('''
-            select x = 99999999.1 from (select x, fn1.line_1i_1o(0)
-            FROM fn2.dt)
-            ''')
-        self.assertRowsEqual([(True,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('DECIMAL(9,1)', rows[0][1])
-
-    def test_dec_64bit_with_scale(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x DECIMAL(18,1))')
-        self.query('insert into fn2.dt values 9999999999999999.1')
-        rows = self.query('''
-            select x = 9999999999999999.1 from (select x, fn1.line_1i_1o(0)
-            FROM fn2.dt)
-            ''')
-        self.assertRowsEqual([(True,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('DECIMAL(18,1)', rows[0][1])
-
-    def test_dec_128bit_with_scale(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x DECIMAL(36,1))')
-        self.query('insert into fn2.dt values 999999999999999999999999999999999.1')
-        rows = self.query('''
-            select x = 999999999999999999999999999999999.1 from (select x, fn1.line_1i_1o(0)
-            FROM fn2.dt)
-            ''')
-        self.assertRowsEqual([(True,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('DECIMAL(36,1)', rows[0][1])
-
-    def test_timestamp(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x TIMESTAMP)')
-        self.query('''
-            insert into fn2.dt values '2010-01-01 23:33:33'
-            ''')
-        rows = self.query('''
-            select x, fn1.line_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(datetime.datetime(2010, 1, 1, 23, 33, 33),0,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('TIMESTAMP(3)', rows[0][1])
-
-    def test_timestamp_with_timezone(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x TIMESTAMP WITH LOCAL TIME ZONE)')
-        self.query('''
-            insert into fn2.dt values '2010-01-01 23:33:33'
-            ''')
-        rows = self.query('''
-            select x, fn1.line_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(datetime.datetime(2010, 1, 1, 23, 33, 33),0,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('TIMESTAMP(3) WITH LOCAL TIME ZONE', rows[0][1])
-
-    def test_date(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x DATE)')
-        self.query('''
-            insert into fn2.dt values '2010-01-01'
-            ''')
-        rows = self.query('''
-            select x, fn1.line_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(datetime.date(2010, 1, 1),0,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('DATE', rows[0][1])
-
-    def test_varchar_utf8(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x VARCHAR(3000) UTF8)')
-        self.query('insert into fn2.dt values repeat(5,300)')
-        rows = self.query('''
-            select x, fn1.line_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([('5'*300,0,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('VARCHAR(3000) UTF8', rows[0][1])
-
-    def test_varchar_ascii(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x VARCHAR(3000) ASCII)')
-        self.query('insert into fn2.dt values repeat(5,300)')
-        rows = self.query('''
-            select x, fn1.line_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([('5'*300,0,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('VARCHAR(3000) ASCII', rows[0][1])
-
-    def test_char_utf8(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x CHAR(2000) UTF8)')
-        self.query('insert into fn2.dt values repeat(5,2000)')
-        rows = self.query('''
-            select x, fn1.line_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([('5'*2000,0,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('CHAR(2000) UTF8', rows[0][1])
-
-    def test_char_ascii(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x CHAR(2000) ASCII)')
-        self.query('insert into fn2.dt values repeat(5,2000)')
-        rows = self.query('''
-            select x, fn1.line_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([('5'*2000,0,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('CHAR(2000) ASCII', rows[0][1])
-
-    def test_interval_ym(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x INTERVAL YEAR TO MONTH)')
-        self.query('''
-            insert into fn2.dt values '23-11'
-            ''')
-        rows = self.query('''
-            select x, fn1.line_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([('+23-11',0,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('INTERVAL YEAR(2) TO MONTH', rows[0][1])
-
-    def test_interval_ds(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x INTERVAL DAY TO SECOND)')
-        self.query('''
-            insert into fn2.dt values '30 23:33:33'
-            ''')
-        rows = self.query('''
-            select x, fn1.line_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([('+30 23:33:33.000',0,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('INTERVAL DAY(2) TO SECOND(3)', rows[0][1])
-
-    def test_geometry(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x GEOMETRY)')
-        self.query('''
-            insert into fn2.dt values 'POINT(1 1)'
-            ''')
-        rows = self.query('''
-            select x, fn1.line_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([('POINT (1 1)',0,)], rows)
-        self.query('create or replace table fn2.foo as select x, fn1.line_1i_1o(0) from fn2.dt')
-        rows = self.query('''
-            describe fn2.foo
-            ''')
-        self.assertEqual('GEOMETRY', rows[0][1])
-
-
-class NullTest(_JavaUdfSetup):
-    def setUp(self):
-        self._setup_fn1_schema()
-        self._create_emit_udfs()
-        
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-
-    def test_boolean_null(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x BOOLEAN)')
-        self.query('insert into fn2.dt values NULL')
-        rows = self.query('''
-            select x, fn1.dob_1i_1o(0), NVL(x,1)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(None,0,True,),(None,0,True,)], rows)
-
-    def test_double_null(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x DOUBLE)')
-        self.query('insert into fn2.dt values NULL')
-        rows = self.query('''
-            select x, fn1.dob_1i_1o(x), NVL(x,1)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(None,None,1,),(None,None,1,)], rows)
-
-    def test_int32_null(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x DECIMAL(9,0))')
-        self.query('insert into fn2.dt values NULL')
-        rows = self.query('''
-            select x, fn1.dob_1i_1o(0), NVL(x,1)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(None,0,1,),(None,0,1,)], rows)
-
-    def test_int64_null(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x DECIMAL(18,0))')
-        self.query('insert into fn2.dt values NULL')
-        rows = self.query('''
-            select x, fn1.dob_1i_1o(0), NVL(x,1)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(None,0,1,),(None,0,1,)], rows)
-
-    def test_int128_null(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x DECIMAL(36,0))')
-        self.query('insert into fn2.dt values NULL')
-        rows = self.query('''
-            select x, fn1.dob_1i_1o(0), NVL(x,1)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(None,0,1,),(None,0,1,)], rows)
-
-    def test_timestamp_null(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x timestamp)')
-        self.query('insert into fn2.dt values NULL')
-        rows = self.query('''
-            select x, fn1.dob_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(None,0,),(None,0,)], rows)
-
-    def test_date_null(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x date)')
-        self.query('insert into fn2.dt values NULL')
-        rows = self.query('''
-            select x, fn1.dob_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(None,0,),(None,0,)], rows)
-
-    def test_intervalym_null(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x interval year to month)')
-        self.query('insert into fn2.dt values NULL')
-        rows = self.query('''
-            select x, fn1.dob_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(None,0,),(None,0,)], rows)
-
-    def test_intervalds_null(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x interval day to second)')
-        self.query('insert into fn2.dt values NULL')
-        rows = self.query('''
-            select x, fn1.dob_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(None,0,),(None,0,)], rows)
-
-    def test_geo_null(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x geometry)')
-        self.query('insert into fn2.dt values NULL')
-        rows = self.query('''
-            select x, fn1.dob_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(None,0,),(None,0,)], rows)
-
-    def test_varchar_null(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x varchar(2000))')
-        self.query('insert into fn2.dt values NULL')
-        rows = self.query('''
-            select x, fn1.dob_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(None,0,),(None,0,)], rows)
-
-    def test_char_null(self):
-        self.query('CREATE OR REPLACE TABLE fn2.DT(x char(2000))')
-        self.query('insert into fn2.dt values NULL')
-        rows = self.query('''
-            select x, fn1.dob_1i_1o(0)
-            FROM fn2.dt
-            ''')
-        self.assertRowsEqual([(None,0,),(None,0,)], rows)
-
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/generic/java/export_alias.py b/test_container/tests/test/generic/java/export_alias.py
deleted file mode 100644
index 040f3f2..0000000
--- a/test_container/tests/test/generic/java/export_alias.py
+++ /dev/null
@@ -1,294 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-
-
-class ExportAliasTest(udf.TestCase):
-    result_unknown = 0
-    result_ok = 1
-    result_failed = 2
-    result_test_error = 3
-
-    def setUp(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-        self.query('OPEN SCHEMA FN1')
-        
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-        self.query('create or replace table fn2.t(a int, z varchar(3000))')
-        self.query("insert into fn2.t values (1, 'x')")
-        self.query('create or replace table fn2.\"tl\"(a int, \"z\" varchar(3000))')
-        self.query("insert into fn2.\"tl\" values (1, 'x')")
-        self.query("create connection FOOCONN to 'a' user 'b' identified by 'c'", ignore_errors=True)
-        
-        self.query('OPEN SCHEMA FN1')
-        
-        # Create all EXPORT UDF scripts
-        self.query(udf.fixindent('''
-            create or replace java set script expal_test_pass_fail(res varchar(100)) emits (x int) as
-            %jvmoption -Xms64m -Xmx128m -Xss512k;
-            class EXPAL_TEST_PASS_FAIL {
-              public static void run(ExaMetadata meta, ExaIterator iter) throws Exception {
-                    String result = iter.getString("res");
-                    if (result.equals("ok")) {
-                        iter.emit(1);
-                    }
-                    else if (result.equals("failed")) {
-                        iter.emit(2);
-                    }
-                    else {
-                        iter.emit(3);
-                    }
-              }
-            }
-            /
-        '''))
-        
-        self.query(udf.fixindent('''
-            create or replace java set script expal_use_param_foo_bar(...) emits (x varchar(2000)) as
-            %jvmoption -Xms64m -Xmx128m -Xss512k;
-            class EXPAL_USE_PARAM_FOO_BAR {
-              static String generateSqlForExportSpec(ExaMetadata exa, ExaExportSpecification exportSpecification) {
-                    if (exportSpecification.getParameters().size() == 2 &&
-                        exportSpecification.getParameters().get("FOO").equals("bar") &&
-                        exportSpecification.getParameters().get("BAR").equals("foo") &&
-                        !exportSpecification.hasConnectionName() &&
-                        exportSpecification.getConnectionName() == null &&
-                        !exportSpecification.hasConnectionInformation() &&
-                        exportSpecification.getConnectionInformation() == null &&
-                        !exportSpecification.hasTruncate() &&
-                        !exportSpecification.hasReplace() &&
-                        !exportSpecification.hasCreatedBy() &&
-                        exportSpecification.getSourceColumnNames().size() == 2 &&
-                        exportSpecification.getSourceColumnNames().get(0).equals("\\"T\\".\\"A\\"") &&
-                        exportSpecification.getSourceColumnNames().get(1).equals("\\"T\\".\\"Z\\"")) {
-                        return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('ok')";
-                    }
-                    return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('failed')";
-              }
-            }
-            /
-        '''))
-        
-        self.query(udf.fixindent('''
-            create or replace java set script expal_use_connection_name(...) emits (x varchar(2000)) as
-            %jvmoption -Xms64m -Xmx128m -Xss512k;
-            class EXPAL_USE_CONNECTION_NAME {
-              static String generateSqlForExportSpec(ExaMetadata exa, ExaExportSpecification exportSpecification) {
-                  if (exportSpecification.getParameters().size() == 2 &&
-                      exportSpecification.getParameters().get("FOO").equals("bar") &&
-                      exportSpecification.getParameters().get("BAR").equals("foo") &&
-                      exportSpecification.hasConnectionName() &&
-                      exportSpecification.getConnectionName().equals("FOOCONN") &&
-                      !exportSpecification.hasConnectionInformation() &&
-                      exportSpecification.getConnectionInformation() == null &&
-                      !exportSpecification.hasTruncate() &&
-                      !exportSpecification.hasReplace() &&
-                      !exportSpecification.hasCreatedBy() &&
-                      exportSpecification.getSourceColumnNames().size() == 2 &&
-                      exportSpecification.getSourceColumnNames().get(0).equals("\\"T\\".\\"A\\"") &&
-                      exportSpecification.getSourceColumnNames().get(1).equals("\\"T\\".\\"Z\\"")) {
-                      return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('ok')";
-                  }
-                  return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('failed')";
-              }
-            }
-            /
-        '''))
-        
-        self.query(udf.fixindent('''
-            create or replace java set script expal_use_connection_info(...) emits (x varchar(2000)) as
-            %jvmoption -Xms64m -Xmx128m -Xss512k;
-            class EXPAL_USE_CONNECTION_INFO {
-              static String generateSqlForExportSpec(ExaMetadata exa, ExaExportSpecification exportSpecification) {
-                  if (exportSpecification.getParameters().size() == 2 &&
-                      exportSpecification.getParameters().get("FOO").equals("bar") &&
-                      exportSpecification.getParameters().get("BAR").equals("foo") &&
-                      !exportSpecification.hasConnectionName() &&
-                      exportSpecification.getConnectionName() == null &&
-                      exportSpecification.hasConnectionInformation() &&
-                      exportSpecification.getConnectionInformation().getAddress().equals("a") &&
-                      exportSpecification.getConnectionInformation().getUser().equals("b") &&
-                      exportSpecification.getConnectionInformation().getPassword().equals("c") &&
-                      !exportSpecification.hasTruncate() &&
-                      !exportSpecification.hasReplace() &&
-                      !exportSpecification.hasCreatedBy() &&
-                      exportSpecification.getSourceColumnNames().size() == 2 &&
-                      exportSpecification.getSourceColumnNames().get(0).equals("\\"T\\".\\"A\\"") &&
-                      exportSpecification.getSourceColumnNames().get(1).equals("\\"T\\".\\"Z\\"")) {
-                      return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('ok')";
-                  }
-                  return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('failed')";
-              }
-            }
-            /
-        '''))
-        
-        self.query(udf.fixindent('''
-            create or replace java set script expal_use_has_truncate(...) emits (x varchar(2000)) as
-            %jvmoption -Xms64m -Xmx128m -Xss512k;
-            class EXPAL_USE_HAS_TRUNCATE {
-              static String generateSqlForExportSpec(ExaMetadata exa, ExaExportSpecification exportSpecification) {
-                  if (exportSpecification.getParameters().size() == 2 &&
-                      exportSpecification.getParameters().get("FOO").equals("bar") &&
-                      exportSpecification.getParameters().get("BAR").equals("foo") &&
-                      !exportSpecification.hasConnectionName() &&
-                      exportSpecification.getConnectionName() == null &&
-                      !exportSpecification.hasConnectionInformation() &&
-                      exportSpecification.getConnectionInformation() == null &&
-                      exportSpecification.hasTruncate() &&
-                      !exportSpecification.hasReplace() &&
-                      !exportSpecification.hasCreatedBy() &&
-                      exportSpecification.getSourceColumnNames().size() == 2 &&
-                      exportSpecification.getSourceColumnNames().get(0).equals("\\"T\\".\\"A\\"") &&
-                      exportSpecification.getSourceColumnNames().get(1).equals("\\"T\\".\\"Z\\"")) {
-                      return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('ok')";
-                  }
-                  return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('failed')";
-              }
-            }
-            /
-        '''))
-        
-        self.query(udf.fixindent('''
-            create or replace java set script expal_use_replace_created_by(...) emits (x varchar(2000)) as
-            %jvmoption -Xms64m -Xmx128m -Xss512k;
-            class EXPAL_USE_REPLACE_CREATED_BY {
-              static String generateSqlForExportSpec(ExaMetadata exa, ExaExportSpecification exportSpecification) {
-                  if (exportSpecification.getParameters().size() == 2 &&
-                      exportSpecification.getParameters().get("FOO").equals("bar") &&
-                      exportSpecification.getParameters().get("BAR").equals("foo") &&
-                      !exportSpecification.hasConnectionName() &&
-                      exportSpecification.getConnectionName() == null &&
-                      !exportSpecification.hasConnectionInformation() &&
-                      exportSpecification.getConnectionInformation() == null &&
-                      !exportSpecification.hasTruncate() &&
-                      exportSpecification.hasReplace() &&
-                      exportSpecification.hasCreatedBy() &&
-                      exportSpecification.getCreatedBy().equals("create table t(a int, z varchar(3000))") &&
-                      exportSpecification.getSourceColumnNames().size() == 2 &&
-                      exportSpecification.getSourceColumnNames().get(0).equals("\\"T\\".\\"A\\"") &&
-                      exportSpecification.getSourceColumnNames().get(1).equals("\\"T\\".\\"Z\\"")) {
-                      return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('ok')";
-                  }
-                  return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('failed')";
-              }
-            }
-            /
-        '''))
-        
-        self.query(udf.fixindent('''
-            create or replace java set script expal_use_column_name_lower_case(...) emits (x varchar(2000)) as
-            %jvmoption -Xms64m -Xmx128m -Xss512k;
-            class EXPAL_USE_COLUMN_NAME_LOWER_CASE {
-              static String generateSqlForExportSpec(ExaMetadata exa, ExaExportSpecification exportSpecification) {
-                    if (exportSpecification.getParameters().size() == 2 &&
-                        exportSpecification.getParameters().get("FOO").equals("bar") &&
-                        exportSpecification.getParameters().get("BAR").equals("foo") &&
-                        !exportSpecification.hasConnectionName() &&
-                        exportSpecification.getConnectionName() == null &&
-                        !exportSpecification.hasConnectionInformation() &&
-                        exportSpecification.getConnectionInformation() == null &&
-                        !exportSpecification.hasTruncate() &&
-                        !exportSpecification.hasReplace() &&
-                        !exportSpecification.hasCreatedBy() &&
-                        exportSpecification.getSourceColumnNames().size() == 2 &&
-                        exportSpecification.getSourceColumnNames().get(0).equals("\\"tl\\".\\"A\\"") &&
-                        exportSpecification.getSourceColumnNames().get(1).equals("\\"tl\\".\\"z\\"")) {
-                        return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('ok')";
-                    }
-                    return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('failed')";
-              }
-            }
-            /
-        '''))
-        
-        self.query(udf.fixindent('''
-            create or replace java set script expal_use_column_selection(...) emits (x varchar(2000)) as
-            %jvmoption -Xms64m -Xmx128m -Xss512k;
-            class EXPAL_USE_COLUMN_SELECTION {
-              static String generateSqlForExportSpec(ExaMetadata exa, ExaExportSpecification exportSpecification) {
-                    if (exportSpecification.getParameters().size() == 2 &&
-                        exportSpecification.getParameters().get("FOO").equals("bar") &&
-                        exportSpecification.getParameters().get("BAR").equals("foo") &&
-                        !exportSpecification.hasConnectionName() &&
-                        exportSpecification.getConnectionName() == null &&
-                        !exportSpecification.hasConnectionInformation() &&
-                        exportSpecification.getConnectionInformation() == null &&
-                        !exportSpecification.hasTruncate() &&
-                        !exportSpecification.hasReplace() &&
-                        !exportSpecification.hasCreatedBy() &&
-                        exportSpecification.getSourceColumnNames().size() == 2 &&
-                        exportSpecification.getSourceColumnNames().get(0).equals("\\"tl\\".\\"A\\"") &&
-                        exportSpecification.getSourceColumnNames().get(1).equals("\\"tl\\".\\"z\\"")) {
-                        return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('ok')";
-                    }
-                    return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('failed')";
-              }
-            }
-            /
-        '''))
-        
-        self.query(udf.fixindent('''
-            create or replace java set script expal_use_query(...) emits (x varchar(2000)) as
-            %jvmoption -Xms64m -Xmx128m -Xss512k;
-            class EXPAL_USE_QUERY {
-              static String generateSqlForExportSpec(ExaMetadata exa, ExaExportSpecification exportSpecification) {
-                    if (exportSpecification.getParameters().size() == 2 &&
-                        exportSpecification.getParameters().get("FOO").equals("bar") &&
-                        exportSpecification.getParameters().get("BAR").equals("foo") &&
-                        !exportSpecification.hasConnectionName() &&
-                        exportSpecification.getConnectionName() == null &&
-                        !exportSpecification.hasConnectionInformation() &&
-                        exportSpecification.getConnectionInformation() == null &&
-                        !exportSpecification.hasTruncate() &&
-                        !exportSpecification.hasReplace() &&
-                        !exportSpecification.hasCreatedBy() &&
-                        exportSpecification.getSourceColumnNames().size() == 2 &&
-                        exportSpecification.getSourceColumnNames().get(0).equals("\\"col1\\"") &&
-                        exportSpecification.getSourceColumnNames().get(1).equals("\\"col2\\"")) {
-                        return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('ok')";
-                    }
-                    return "select " + exa.getScriptSchema() + ".expal_test_pass_fail('failed')";
-              }
-            }
-            /
-        '''))
-
-
-    def test_export_use_params(self):
-        rows = self.executeStatement("EXPORT fn2.t INTO SCRIPT fn1.expal_use_param_foo_bar with foo='bar' bar='foo'")
-        self.assertEqual(self.result_ok, rows)
-
-    def test_export_use_connection_name(self):
-        rows = self.executeStatement("EXPORT fn2.t INTO SCRIPT fn1.expal_use_connection_name AT FOOCONN with foo='bar' bar='foo'")
-        self.assertEqual(self.result_ok, rows)
-
-    def test_export_use_connection_info(self):
-        rows = self.executeStatement("EXPORT fn2.t INTO SCRIPT fn1.expal_use_connection_info AT 'a' USER 'b' IDENTIFIED BY 'c' with foo='bar' bar='foo'")
-        self.assertEqual(self.result_ok, rows)
-
-    def test_export_use_has_truncate(self):
-        rows = self.executeStatement("EXPORT fn2.t INTO SCRIPT fn1.expal_use_has_truncate with foo='bar' bar='foo' truncate")
-        self.assertEqual(self.result_ok, rows)
-
-    def test_export_use_replace_created_by(self):
-        rows = self.executeStatement("EXPORT fn2.t INTO SCRIPT fn1.expal_use_replace_created_by with foo='bar' bar='foo' replace created by 'create table t(a int, z varchar(3000))'")
-        self.assertEqual(self.result_ok, rows)
-
-    def test_export_use_column_name_lower_case(self):
-        rows = self.executeStatement("EXPORT fn2.\"tl\" INTO SCRIPT fn1.expal_use_column_name_lower_case with foo='bar' bar='foo'")
-        self.assertEqual(self.result_ok, rows)
-
-    def test_export_use_column_selection(self):
-        rows = self.executeStatement("EXPORT fn2.\"tl\"(a, \"z\") INTO SCRIPT fn1.expal_use_column_selection with foo='bar' bar='foo'")
-        self.assertEqual(self.result_ok, rows)
-
-    def test_export_use_query(self):
-        rows = self.executeStatement("EXPORT (select a as 'col1', \"z\" as 'col2' from fn2.\"tl\") INTO SCRIPT fn1.expal_use_query with foo='bar' bar='foo'")
-        self.assertEqual(self.result_ok, rows)
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/generic/java/generic_types.py b/test_container/tests/test/generic/java/generic_types.py
deleted file mode 100755
index 0b20545..0000000
--- a/test_container/tests/test/generic/java/generic_types.py
+++ /dev/null
@@ -1,368 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-
-
-class _JavaUdfSetup(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-        self.query('OPEN SCHEMA FN1')
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            bottleneck_char10(i VARCHAR(20))
-            RETURNS CHAR(10) AS
-            class BOTTLENECK_CHAR10 {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return ctx.getString("i");
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            bottleneck_decimal5(i DECIMAL(20, 0))
-            RETURNS DECIMAL(5, 0) AS
-            import java.math.BigDecimal;
-            class BOTTLENECK_DECIMAL5 {
-                static BigDecimal run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return ctx.getBigDecimal("i");
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            bottleneck_varchar10(i VARCHAR(20))
-            RETURNS VARCHAR(10) AS
-            class BOTTLENECK_VARCHAR10 {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return ctx.getString("i");
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT echo_boolean(x BOOLEAN) RETURNS BOOLEAN AS
-            class ECHO_BOOLEAN {
-                static Boolean run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getBoolean("x") != null)
-            return ctx.getBoolean("x");
-                    return null;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT echo_char1(x CHAR(1)) RETURNS CHAR(1) AS
-            class ECHO_CHAR1 {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getString("x") != null)
-            return ctx.getString("x");
-                    return null;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT echo_char10(x CHAR(10)) RETURNS CHAR(10) AS
-            class ECHO_CHAR10 {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getString("x") != null && ctx.getString("x").length() == 10)
-            return ctx.getString("x");
-                    return null;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT echo_date(x DATE) RETURNS DATE AS
-            import java.sql.Date;
-            class ECHO_DATE {
-                static Date run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getDate("x") != null)
-            return ctx.getDate("x");
-                    return null;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT echo_decimal_36_0(x DECIMAL(36,0)) RETURNS DECIMAL(36,0) AS
-            import java.math.BigDecimal;
-            class ECHO_DECIMAL_36_0 {
-                static BigDecimal run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getBigDecimal("x") != null)
-            return ctx.getBigDecimal("x");
-                    return null;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT echo_decimal_36_36(x DECIMAL(36,36)) RETURNS DECIMAL(36,36) AS
-            import java.math.BigDecimal;
-            class ECHO_DECIMAL_36_36 {
-                static BigDecimal run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getBigDecimal("x") != null)
-            return ctx.getBigDecimal("x");
-                    return null;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT echo_double(x DOUBLE) RETURNS DOUBLE AS
-            class ECHO_DOUBLE {
-                static Double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getDouble("x") != null)
-            return ctx.getDouble("x");
-                    return null;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT echo_integer(x INTEGER) RETURNS INTEGER AS
-            class ECHO_INTEGER {
-                static Long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getLong("x") != null)
-            return ctx.getLong("x");
-                    return null;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT echo_timestamp(x TIMESTAMP) RETURNS TIMESTAMP AS
-            import java.sql.Timestamp;
-            class ECHO_TIMESTAMP {
-                static Timestamp run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getTimestamp("x") != null)
-            return ctx.getTimestamp("x");
-                    return null;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT echo_varchar10(x VARCHAR(10)) RETURNS VARCHAR(10) AS
-            class ECHO_VARCHAR10 {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getString("x") != null)
-            return ctx.getString("x");
-                    return null;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT run_func_is_empty() RETURNS DOUBLE AS
-            class RUN_FUNC_IS_EMPTY {
-                static Double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return null;
-                }
-            }
-            /
-        '''))
-
-class TestEcho(_JavaUdfSetup):
-
-    def test_echo_boolean(self):
-        rows = self.query('''
-            SELECT
-                fn1.echo_boolean(Null) is NULL,
-                fn1.echo_boolean(True) = True,
-                fn1.echo_boolean(False) = False
-            FROM DUAL''')
-        self.assertRowsEqual([(True, True, True)], rows)
-
-    def test_echo_char1(self):
-        rows = self.query('''
-            SELECT
-                fn1.echo_char1(NULL) is NULL,
-                fn1.echo_char1('a') = 'a'
-            FROM DUAL''')
-        self.assertRowsEqual([(True, True)], rows)
-
-    def test_echo_char10(self):
-        rows = self.query('''
-            SELECT
-                fn1.echo_char10(NULL) is NULL,
-                fn1.echo_char10('ab') = 'ab        '
-            FROM DUAL''')
-        self.assertRowsEqual([(True, True)], rows)
-
-    def test_echo_date(self):
-        rows = self.query('''
-            SELECT
-                fn1.echo_date(NULL) is NULL,
-                fn1.echo_date(current_date()) = current_date()
-            FROM DUAL''')
-        self.assertRowsEqual([(True, True)], rows)
-
-    def test_echo_integer_basic(self):
-        rows = self.query('''
-            SELECT
-                fn1.echo_integer(NULL) is NULL,
-                fn1.echo_integer(-1) = -1,
-                fn1.echo_integer(0) = 0,
-                fn1.echo_integer(1) = 1
-            FROM DUAL''')
-        self.assertRowsEqual([(True, True, True, True)], rows)
-
-    def test_echo_integer_limits(self):
-        """DWA-13784 (R)"""
-        rows = self.query('''
-            SELECT
-                fn1.echo_integer(-(1e18 - 1)) = -(1e18 - 1),
-                fn1.echo_integer(  1e18 - 1)  =   1e18 - 1
-            FROM DUAL''')
-        self.assertRowsEqual([(True, True)], rows)
-
-    def test_echo_double(self):
-        rows = self.query('''
-            SELECT
-                fn1.echo_double(NULL) is NULL,
-                fn1.echo_double(CAST(1.5 AS DOUBLE)) = CAST(1.5 AS DOUBLE),
-                fn1.echo_double(0) = 0.0,
-                fn1.echo_double(0.0) = 0.0,
-                fn1.echo_double(-1.7e-308) = -1.7e-308,
-                fn1.echo_double(+1.7e-308) = +1.7e-308
-            FROM DUAL''')
-        self.assertRowsEqual([(True, True, True, True, True, True)], rows)
-
-    def test_echo_decimal_36_0_basic(self):
-        rows = self.query('''
-            SELECT
-                fn1.echo_decimal_36_0(NULL) is NULL,
-                fn1.echo_decimal_36_0(0) = 0,
-                fn1.echo_decimal_36_0(0.0) = 0.0
-            FROM DUAL''')
-        self.assertRowsEqual([(True, True, True)], rows)
-
-    def test_echo_decimal_36_0_limits(self):
-        """DWA-13784 (R)"""
-        rows = self.query('''
-            SELECT
-                fn1.echo_decimal_36_0(-(1e35 - 1)) = -(1e35 - 1),
-                fn1.echo_decimal_36_0(  1e35 - 1)  =   1e35 - 1
-            FROM DUAL''')
-        self.assertRowsEqual([(True, True)], rows)
-
-    def test_echo_decimal_36_36_basic(self):
-        rows = self.query('''
-            SELECT
-                fn1.echo_decimal_36_36(NULL) is NULL,
-                fn1.echo_decimal_36_36(0) = 0,
-                fn1.echo_decimal_36_36(0.0) = 0.0
-            FROM DUAL''')
-        self.assertRowsEqual([(True, True, True)], rows)
-
-    def test_echo_decimal_36_36_limits(self):
-        """DWA-13784 (R)"""
-        rows = self.query('''
-            SELECT
-                fn1.echo_decimal_36_36(-(1e-35 - 1)) = -(1e-35 - 1),
-                fn1.echo_decimal_36_36(  1e-35 - 1)  =   1e-35 - 1
-            FROM DUAL''')
-        self.assertRowsEqual([(True, True)], rows)
-
-    def test_echo_varchar10(self):
-        rows = self.query('''
-            SELECT
-                fn1.echo_varchar10(NULL) is NULL,
-                fn1.echo_varchar10('') is NULL,
-                fn1.echo_varchar10(' ') = ' ',
-                fn1.echo_varchar10('a') = 'a',
-                fn1.echo_varchar10('a ') = 'a ',
-                fn1.echo_varchar10(' a ') = ' a '
-            FROM DUAL''')
-        self.assertRowsEqual([(True, True, True, True, True, True)], rows)
-
-    def test_echo_timestamp(self):
-        rows = self.query('''
-            SELECT fn1.echo_timestamp(NULL) is NULL
-            FROM DUAL''')
-        self.assertRowsEqual([(True,)], rows)
-        
-        rows = self.query('''
-            SELECT fn1.echo_timestamp('2017-08-01 13:13:50.910') = '2017-08-01 13:13:50.910',
-                   fn1.echo_timestamp('2017-08-01 13:13:50.983') = '2017-08-01 13:13:50.983'
-            FROM DUAL''')
-        self.assertRowsEqual([(True, True)], rows)
-
-        self.query('DROP SCHEMA ECHO_TEST CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA ECHO_TEST')
-        self.query('''CREATE OR REPLACE TABLE ECHO_TEST.N1 (now VARCHAR(255))''')
-        self.query('''INSERT INTO ECHO_TEST.N1 VALUES (SELECT now() AS x FROM DUAL)''')
-        self.query('''    
-            SELECT x1 = x2, x1, x2, x3
-            FROM (SELECT fn1.echo_timestamp(x) AS x1, x AS x2, x AS x3
-                  FROM (SELECT now AS x FROM ECHO_TEST.N1))
-                  ''')
-        self.assertEqual(True, rows[0][0], str(rows))
-        self.query('''DROP SCHEMA ECHO_TEST CASCADE''')
-
-
-class EmptyTest(_JavaUdfSetup):
-    def test_run_func_is_empty(self):
-        rows = self.query('''
-            SELECT
-                fn1.run_func_is_empty() IS NULL
-            FROM DUAL''')
-        self.assertRowsEqual([(True,)], rows)
-
-
-class BottleneckTest(_JavaUdfSetup):
-    def test_varchar10(self):
-        for i in 0, 1, 5, 10:
-            rows = self.query('''
-                SELECT fn1.bottleneck_varchar10('%s')
-                FROM DUAL''' % ('x' * i))
-            self.assertEqual('x' * i if i > 0 else None, rows[0][0])
-        with self.assertRaises(Exception):
-            self.query('''
-                SELECT fn1.bottleneck_varchar10('%s')
-                FROM DUAL''' % ('x' * 11))
-
-    def test_char10(self):
-        for i in 0, 1, 5, 10:
-            rows = self.query('''
-                SELECT fn1.bottleneck_char10('%s')
-                FROM DUAL''' % ('x' * i))
-            self.assertEqual(
-                    ('x' * i + ' ' * 10)[:10] if i > 0 else None,
-                    rows[0][0])
-        with self.assertRaises(Exception):
-            self.query('''
-                SELECT fn1.bottleneck_char10('%s')
-                FROM DUAL''' % ('x' * 11))
-
-    def test_decimal5(self):
-        for i in 3, 4:
-            rows = self.query('''
-                SELECT fn1.bottleneck_decimal5(%d)
-                FROM DUAL''' % (10 ** i))
-            self.assertEqual(10 ** i, rows[0][0])
-        with self.assertRaises(Exception):
-            self.query('''
-                SELECT fn1.bottleneck_decimal5(%d)
-                FROM DUAL''' % (10 ** 5))
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/generic/java/get_connection.py b/test_container/tests/test/generic/java/get_connection.py
deleted file mode 100644
index b594f2c..0000000
--- a/test_container/tests/test/generic/java/get_connection.py
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-from exasol_python_test_framework import exatest
-
-
-class _JavaUdfSetup(udf.TestCase):
-
-    def _setup_common_udfs(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-        self.query('OPEN SCHEMA FN1')
-
-        self.query(udf.fixindent('''
-            CREATE OR REPLACE JAVA SCALAR SCRIPT PRINT_CONNECTION(conn varchar(1000))
-            EMITS(type varchar(200), addr varchar(2000000), usr varchar(2000000), pwd varchar(2000000))
-            AS
-            class PRINT_CONNECTION {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ExaConnectionInformation c = exa.getConnection(ctx.getString("conn"));
-                    ctx.emit(
-                        c.getType().toString().toLowerCase(),
-                        c.getAddress(),
-                        c.getUser(),
-                        c.getPassword()
-                    );
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE OR REPLACE JAVA SET SCRIPT PRINT_CONNECTION_SET_EMITS(conn varchar(1000))
-            EMITS(type varchar(200), addr varchar(2000000), usr varchar(2000000), pwd varchar(2000000))
-            AS
-            class PRINT_CONNECTION_SET_EMITS {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ExaConnectionInformation c = exa.getConnection(ctx.getString("conn"));
-                    ctx.emit(
-                        c.getType().toString().toLowerCase(),
-                        c.getAddress(),
-                        c.getUser(),
-                        c.getPassword()
-                    );
-                }
-            }
-            /
-        '''))
-
-
-class GetConnectionMemoryBug(_JavaUdfSetup):
-
-    def setUp(self):
-        self._setup_common_udfs()
-        self.query(
-            '''CREATE OR REPLACE CONNECTION test_get_connection_bug_connection TO '' USER 'ialjksdhfalskdjhflaskdjfhalskdjhflaksjdhflaksdjfhalksjdfhlaksjdhflaksjdhfalskjdfhalskdjhflaksjdhflaksjdfhlaksjsadajksdhfaksjdfhalksdjfhalksdjfhalksjdfhqwiueryqw;er;lkjqwe;rdhflaksjdfhlaksdjfhaabcdefghijklmnopqrstuvwxyz' IDENTIFIED BY 'abcdeoqsdfgsdjfglksjdfhglskjdfhglskdjfglskjdfghuietyewlrkjthertrewerlkjhqwelrkjhqwerlkjnwqerlkjhqwerkjlhqwerlkjhqwerlkhqwerkljhqwerlkjhqwerfghijklmnopqrstuvwxyz';''')
-
-    def test_get_connection(self):
-        for x in range(10):
-            row = self.query(
-                '''with ten as (values 0,1,2,3,4,5,6,7,8,9 as p(x)) select count(*) from (select fn1.print_connection_set_emits('test_get_connection_bug_connection') from (select a.x from ten a, ten, ten, ten, ten) v group by mod(v.rownum,4019))''')[
-                0]
-            self.assertEqual(4019, row[0])
-
-
-class GetConnectionTest(_JavaUdfSetup):
-
-    def setUp(self):
-        self._setup_common_udfs()
-        self.query('drop connection FOOCONN', ignore_errors=True)
-        self.query('''
-        create connection FOOCONN to 'a' user 'b' identified by 'c'
-        ''')
-
-    def tearDown(self):
-        self.query('drop connection FOOCONN', ignore_errors=True)
-
-    def test_print_existing_connection(self):
-        rows = self.query('''
-            SELECT fn1.print_connection('FOOCONN')
-            ''')
-        self.assertRowsEqual([('password', 'a', 'b', 'c')], rows)
-
-    def test_connection_not_found(self):
-        with self.assertRaisesRegex(Exception, 'connection FOO does not exist'):
-            self.query('''
-                SELECT fn1.print_connection('FOO')
-                ''')
-
-
-class BigConnectionTest(_JavaUdfSetup):
-    address = "a" * 2 * 1000 * 100
-    user = "u" * 2 * 1000 * 100
-    password = "p" * 2 * 1000 * 100
-
-    def setUp(self):
-        self._setup_common_udfs()
-        self.query('DROP CONNECTION LARGEST_CONN', ignore_errors=True)
-        self.query('''
-            create connection LARGEST_CONN to '{address}' user '{user}' identified by '{password}'
-            '''.format(address=self.address, user=self.user, password=self.password))
-
-    def tearDown(self):
-        self.query("DROP CONNECTION LARGEST_CONN", ignore_errors=True)
-
-    def testGetBigConnection(self):
-        rows = self.query('''
-            SELECT fn1.print_connection('LARGEST_CONN')
-            ''')
-        self.assertRowsEqual([('password', self.address, self.user, self.password)], rows)
-
-
-class OptionalUSERandIDENTIFIEDBYTest(_JavaUdfSetup):
-
-    def setUp(self):
-        self._setup_common_udfs()
-
-    def testNoUSERandNoIDENTIFIEDBY(self):
-        self.query("CREATE or replace CONNECTION my_conn1 TO 'MYADDRESS'")
-        rows = self.query('''SELECT fn1.print_connection('MY_CONN1')''')
-        self.assertRowsEqual([('password', 'MYADDRESS', None, None)], rows)
-        self.query("drop CONNECTION my_conn1")
-
-    def testNoUSER(self):
-        self.query("CREATE or replace CONNECTION my_conn2 TO 'MYADDRESS' identified by 'MYPASSWORD'")
-        rows = self.query('''SELECT fn1.print_connection('MY_CONN2')''')
-        self.assertRowsEqual([('password', 'MYADDRESS', None, 'MYPASSWORD')], rows)
-        self.query("drop CONNECTION my_conn2")
-
-    def testNoIDENIFIEDBY(self):
-        self.query("CREATE or replace CONNECTION my_conn3 TO 'MYADDRESS' USER 'MYUSER'")
-        rows = self.query('''SELECT fn1.print_connection('MY_CONN3')''')
-        self.assertRowsEqual([('password', 'MYADDRESS', "MYUSER", None)], rows)
-        self.query("drop CONNECTION my_conn3")
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/generic/java/import_alias.py b/test_container/tests/test/generic/java/import_alias.py
deleted file mode 100644
index 900a1eb..0000000
--- a/test_container/tests/test/generic/java/import_alias.py
+++ /dev/null
@@ -1,258 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-from exasol_python_test_framework import exatest
-from exasol_python_test_framework.udf import skip
-
-
-class ImportAliasTest(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-        self.query('OPEN SCHEMA FN1')
-        
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-        self.query('create or replace table fn2.t(z varchar(3000))')
-        self.query('create or replace table fn2.t2(y varchar(2000), z varchar(3000))')
-        self.query('drop connection FOOCONN', ignore_errors=True)
-        self.query('''
-                   create connection FOOCONN to 'a' user 'b' identified by 'c'
-                   ''', ignore_errors=True)
-        
-        self.query('OPEN SCHEMA FN1')
-        
-        # Create all IMPORT UDF scripts
-        self.query(udf.fixindent('''
-            create or replace java set script impal_use_is_subselect(...) emits (x varchar(2000)) as
-            %jvmoption -Xms64m -Xmx128m -Xss512k;
-            class IMPAL_USE_IS_SUBSELECT {
-              static String generateSqlForImportSpec(ExaMetadata exa, ExaImportSpecification importSpecification) {
-                return "select " + importSpecification.isSubselect();
-              }
-            }
-            /
-        '''))
-        
-        self.query(udf.fixindent('''
-            create or replace java set script impal_use_param_foo_bar(...) emits (x varchar(2000)) as
-            %jvmoption -Xms64m -Xmx128m -Xss512k;
-            class IMPAL_USE_PARAM_FOO_BAR {
-              static String generateSqlForImportSpec(ExaMetadata exa, ExaImportSpecification importSpecification) {
-                    return "select '" +  importSpecification.getParameters().get("FOO") + "', '" + importSpecification.getParameters().get("BAR") + "'";
-              }
-            }
-            /
-        '''))
-        
-        self.query(udf.fixindent('''
-            create or replace java set script impal_use_connection_name(...) emits (x varchar(2000)) as
-            %jvmoption -Xms64m -Xmx128m -Xss512k;
-            class IMPAL_USE_CONNECTION_NAME {
-              static String generateSqlForImportSpec(ExaMetadata exa, ExaImportSpecification importSpecification) {
-                    return "select '" +  importSpecification.getConnectionName() + "'";
-              }
-            }
-            /
-        '''))
-        
-        self.query(udf.fixindent('''
-            create or replace java set script impal_use_connection_fooconn(...) emits (x varchar(2000)) as
-            %jvmoption -Xms64m -Xmx128m -Xss512k;
-            class IMPAL_USE_CONNECTION_FOOCONN {
-              static String generateSqlForImportSpec(ExaMetadata exa, ExaImportSpecification importSpecification) throws Exception {
-                    ExaConnectionInformation c = exa.getConnection("FOOCONN");
-                    return "select '" + c.getAddress() + c.getUser() + c.getPassword() + "'";
-              }
-            }
-            /
-        '''))
-        
-        self.query(udf.fixindent('''
-            create or replace java set script impal_use_connection(...) emits (x varchar(2000)) as
-            %jvmoption -Xms64m -Xmx128m -Xss512k;
-            class IMPAL_USE_CONNECTION {
-              static String generateSqlForImportSpec(ExaMetadata exa, ExaImportSpecification importSpecification) {
-                    ExaConnectionInformation conn =  importSpecification.getConnectionInformation();
-                    return "select '" +  conn.getUser() +  conn.getPassword() +  conn.getAddress() +  conn.getType().toString().toLowerCase() + "'";
-              }
-            }
-            /
-        '''))
-        
-        self.query(udf.fixindent('''
-            create or replace java set script impal_use_all(...) emits (x varchar(2000)) as
-            %jvmoption -Xms64m -Xmx128m -Xss512k;
-            class IMPAL_USE_ALL {
-              static String generateSqlForImportSpec(ExaMetadata exa, ExaImportSpecification importSpecification) {
-                        String is_sub = "FALSE";
-                    if (importSpecification.isSubselect()) {
-                                    is_sub = "TRUE";
-                            }
-                    String connection_string = "X";
-                    String connection_name = "Y";
-                    String foo = "Z";
-                    String types = "T";
-                    String names = "N";
-                    if (importSpecification.hasConnectionInformation()) {
-                            ExaConnectionInformation conn =  importSpecification.getConnectionInformation();
-                            connection_string = conn.getUser() +  conn.getPassword() +  conn.getAddress() +  conn.getType().toString().toLowerCase();
-                    }
-                    if (importSpecification.hasConnectionName()) {
-                            connection_name = importSpecification.getConnectionName();
-                    }
-                    if (importSpecification.getParameters().get("FOO") != null) {
-                            foo = importSpecification.getParameters().get("FOO");
-                    }
-                    if (importSpecification.getSubselectColumnNames().size() > 0) {
-                            for (int i = 0; i < importSpecification.getSubselectColumnNames().size(); i++) {
-                                    types = types + importSpecification.getSubselectColumnSqlTypes().get(i);
-                                    names = names + importSpecification.getSubselectColumnNames().get(i);
-                            }
-                    }
-                    return "select 1, '" + is_sub + '_' + connection_name + '_' + connection_string + '_' +  foo + '_' + types + '_' + names + "'";
-              }
-            }
-            /
-        '''))
-
-    def test_import_use_is_subselect(self):
-        self.query('''
-            IMPORT INTO fn2.t FROM SCRIPT fn1.impal_use_is_subselect
-            ''')
-        rows = self.query('select * from fn2.t')
-        self.assertRowsEqual([('FALSE',)], rows)
-        self.query('truncate table fn2.t')
-
-    def test_import_use_is_subselect_subselect(self):
-        rows = self.query('''
-            SELECT * FROM (IMPORT FROM SCRIPT fn1.impal_use_is_subselect)
-            ''')
-        self.assertRowsEqual([(True,)], rows)
-        rows = self.query('''
-            IMPORT FROM SCRIPT fn1.impal_use_is_subselect
-            ''')
-        self.assertRowsEqual([(True,)], rows)
-
-    def test_import_use_params(self):
-        self.query("IMPORT INTO fn2.t2 FROM SCRIPT fn1.impal_use_param_foo_bar with foo='bar' bar='foo'")
-        rows = self.query('select * from fn2.t2')
-        self.assertRowsEqual([('bar','foo')], rows)
-        self.query('truncate table fn2.t2')
-
-    def test_import_use_params_subselect(self):
-        rows = self.query("SELECT * FROM (IMPORT FROM SCRIPT fn1.impal_use_param_foo_bar with foo='bar' bar='foo')")
-        self.assertRowsEqual([('bar','foo')], rows)
-        rows = self.query("IMPORT FROM SCRIPT fn1.impal_use_param_foo_bar with foo='bar' bar='foo'")
-        self.assertRowsEqual([('bar','foo')], rows)
-
-    def test_import_use_connection_name(self):
-        self.query('IMPORT INTO fn2.t FROM SCRIPT fn1.impal_use_connection_name at fooconn')
-        rows = self.query('select * from fn2.t')
-        self.assertRowsEqual([('FOOCONN',)], rows)
-        self.query('truncate table fn2.t')
-
-    def test_import_use_connection_fooconn(self):
-        rows = self.query('IMPORT FROM SCRIPT fn1.impal_use_connection_fooconn')
-        self.assertRowsEqual([('abc',)], rows)
-        self.query('truncate table fn2.t')
-
-    def getConnection(self, username, password):
-        client = exatest.ODBCClient('exatest')
-        self.log.debug('connecting to DSN "exa" for user {username}'.format(username=username))
-        client.connect(uid = username, pwd = password)
-        return client
-
-    def createUser(self, username, password):
-        self.query('DROP USER IF EXISTS {username} CASCADE'.format(username = username))
-        self.query('CREATE USER {username} IDENTIFIED BY "{password}"'.format(username = username, password = password))
-        self.query('GRANT CREATE SESSION TO {username}'.format(username=username))
-
-    @skip("IMPORT FROM SCRIPT cannot be used in view definitions")
-    def test_import_use_connection_fooconn_for_user_foo_and_view(self):
-        self.query('create view fn2.fooconn_import_view as IMPORT FROM SCRIPT fn1.impal_use_connection_fooconn')
-        self.createUser('foo','foo')
-        self.commit()
-        foo_conn = self.getConnection('foo','foo')
-        rows = foo_conn.query('select * from fn2.fooconn_import_view')
-        self.assertRowsEqual([('abc',)], rows)
-        self.query('drop user foo cascade')
-        self.query('drop view fn2.fooconn_import_view')
-
-    def test_import_use_connection_name_subselect(self):
-        rows = self.query('SELECT * FROM (IMPORT FROM SCRIPT fn1.impal_use_connection_name at fooconn)')
-        self.assertRowsEqual([('FOOCONN',)], rows)
-        rows = self.query('IMPORT FROM SCRIPT fn1.impal_use_connection_name at fooconn')
-        self.assertRowsEqual([('FOOCONN',)], rows)
-
-    def test_import_use_connection(self):
-        self.query('''
-            IMPORT INTO fn2.t FROM SCRIPT fn1.impal_use_connection
-            at 'fooconn' user 'hans' identified by 'meiser'
-            ''')
-        rows = self.query('select * from fn2.t')
-        self.assertRowsEqual([('hansmeiserfooconnpassword',)], rows)
-        self.query('truncate table fn2.t')
-
-    def test_import_use_connection_subselect(self):
-        rows = self.query(''' SELECT * FROM (
-            IMPORT FROM SCRIPT fn1.impal_use_connection
-            at 'fooconn' user 'hans' identified by 'meiser')
-            ''')
-        self.assertRowsEqual([('hansmeiserfooconnpassword',)], rows)
-        rows = self.query('''
-            IMPORT FROM SCRIPT fn1.impal_use_connection
-            at 'fooconn' user 'hans' identified by 'meiser'
-            ''')
-        self.assertRowsEqual([('hansmeiserfooconnpassword',)], rows)
-
-    def test_import_use_all(self):
-        self.query('''
-            IMPORT INTO fn2.t2 FROM SCRIPT fn1.impal_use_all
-            at 'fooconn' user 'hans' identified by 'meiser' with foo='a value'
-            ''')
-        rows = self.query('select * from fn2.t2')
-        self.assertRowsEqual([('1','FALSE_Y_hansmeiserfooconnpassword_a value_T_N')], rows)
-        self.query('truncate table fn2.t2')
-
-    def test_import_use_all_subselect(self):
-        rows = self.query(''' SELECT * FROM (
-            IMPORT INTO (a double, b varchar(3000)) FROM SCRIPT fn1.impal_use_all
-            at 'fooconn' user 'hans' identified by 'meiser' with foo='a value')
-            ''')
-        self.assertRowsEqual([(1, 'TRUE_Y_hansmeiserfooconnpassword_a value_TDOUBLEVARCHAR(3000) UTF8_NAB')], rows)
-        rows = self.query('''
-        IMPORT INTO (a double, b varchar(3000)) FROM SCRIPT fn1.impal_use_all
-        at 'fooconn' user 'hans' identified by 'meiser' with foo='a value'
-            ''')
-        self.assertRowsEqual([(1, 'TRUE_Y_hansmeiserfooconnpassword_a value_TDOUBLEVARCHAR(3000) UTF8_NAB')], rows)
-
-    def test_prepared_statement_params(self):
-        with self.assertRaisesRegex(Exception, 'syntax error, unexpected \'?\''):
-            rows = self.query(''' SELECT * FROM (
-                IMPORT INTO (a double, b varchar(3000)) FROM SCRIPT fn1.impal_use_all
-                at 'fooconn' user 'hans' identified by 'meiser' with foo=?)
-                ''', 'bar')
-
-    def test_prepared_statement_conn(self):
-        with self.assertRaisesRegex(Exception, 'syntax error, unexpected \'?\''):
-            rows = self.query(''' SELECT * FROM (
-                IMPORT INTO (a double, b varchar(3000)) FROM SCRIPT fn1.impal_use_all
-                at ? user ? identified by ? with foo='bar')
-                ''', 'fooconn', 'hans', 'meiser', 'bar')
-
-    def test_import_in_lua_scripting(self):
-        self.query('''
-            create or replace script s1() as
-                res = pquery [[ IMPORT INTO fn2.t FROM SCRIPT fn1.impal_use_is_subselect ]]
-         ''')
-        self.query('execute script s1()')
-        rows = self.query('select * from fn2.t')
-        self.assertRowsEqual([('FALSE',)], rows)
-        self.query('truncate table fn2.t')
-
-
-if __name__ == '__main__':
-    udf.main()
-
-
diff --git a/test_container/tests/test/generic/java/metadata.py b/test_container/tests/test/generic/java/metadata.py
deleted file mode 100755
index e9b6ae7..0000000
--- a/test_container/tests/test/generic/java/metadata.py
+++ /dev/null
@@ -1,508 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-
-
-class _JavaUdfSetup(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-        self.query('OPEN SCHEMA FN1')
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_char_length(text char(10))
-            emits(len1 number, len2 number, dummy char(20))
-            as
-            class GET_CHAR_LENGTH {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    long v = exa.getInputColumnLength(0);
-                    long w = exa.getOutputColumnLength(2);
-                    ctx.emit(v, w, "9876543210");
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_current_schema() returns varchar(200) as
-            class GET_CURRENT_SCHEMA {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getCurrentSchema();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_current_user() returns varchar(200) as
-            class GET_CURRENT_USER {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getCurrentUser();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT
-            get_database_name() returns varchar(300) AS
-            class GET_DATABASE_NAME {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getDatabaseName();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_database_version() returns varchar(20) as
-            class GET_DATABASE_VERSION {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getDatabaseVersion();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_input_column_count_scalar(c1 double, c2 varchar(100))
-            returns number as
-            class GET_INPUT_COLUMN_COUNT_SCALAR {
-                static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getInputColumnCount();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java set script
-            get_input_column_count_set(c1 double, c2 varchar(100))
-            returns number as
-            class GET_INPUT_COLUMN_COUNT_SET {
-                static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getInputColumnCount();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_input_columns(c1 double, c2 varchar(200))
-            emits (column_id number, column_name varchar(200), column_type varchar(20),
-             	   column_sql_type varchar(20), column_precision number, column_scale number,
-              	   column_length number) as
-            class GET_INPUT_COLUMNS {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    for (int i = 0; i < exa.getInputColumnCount(); i++) {
-            String name = exa.getInputColumnName(i);
-            long precision = exa.getInputColumnPrecision(i);
-            String thetype = exa.getInputColumnType(i).getCanonicalName();
-            String sql_type = exa.getInputColumnSqlType(i);
-            long scale = exa.getInputColumnScale(i);
-            long length = exa.getInputColumnLength(i);
-            if (name == null)
-                name = "no-name";
-            if (thetype == null)
-                thetype = "no-type";
-            if (sql_type == null)
-                sql_type = "no-sql-type";
-            ctx.emit(i + 1, name, thetype, sql_type, precision, scale, length);
-                    }
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_input_type_scalar() returns varchar(200) as
-            class GET_INPUT_TYPE_SCALAR {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getInputType();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java set script
-            get_input_type_set(a double) returns varchar(200) as
-            class GET_INPUT_TYPE_SET {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getInputType();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_node_id() returns number as
-            class GET_NODE_ID {
-                static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getNodeId();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_output_column_count_emit()
-            emits (x number, y number, z number) as
-            class GET_OUTPUT_COLUMN_COUNT_EMIT {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(exa.getOutputColumnCount(), exa.getOutputColumnCount(), exa.getOutputColumnCount());
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_output_column_count_return()
-            returns number as
-            class GET_OUTPUT_COLUMN_COUNT_RETURN {
-                static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getOutputColumnCount();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_output_columns()
-            emits (column_id number, column_name varchar(200), column_type varchar(20),
-             	   column_sql_type varchar(20), column_precision number, column_scale number,
-              	   column_length number) as
-            class GET_OUTPUT_COLUMNS {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    for (int i = 0; i < exa.getOutputColumnCount(); i++) {
-            String name = exa.getOutputColumnName(i);
-            long precision = exa.getOutputColumnPrecision(i);
-            String thetype = exa.getOutputColumnType(i).getCanonicalName();
-            String sql_type = exa.getOutputColumnSqlType(i);
-            long scale = exa.getOutputColumnScale(i);
-            long length = exa.getOutputColumnLength(i);
-            if (name == null)
-               name = "no-name";
-            if (thetype == null)
-               thetype = "no-type";
-            if (sql_type == null)
-               sql_type = "no-sql-type";
-            ctx.emit(i + 1, name, thetype, sql_type, precision, scale, length);
-                    }
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_output_type_emit()
-            emits (t varchar(200)) as
-            class GET_OUTPUT_TYPE_EMIT {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(exa.getOutputType());
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_output_type_return()
-            returns varchar(200) as
-            class GET_OUTPUT_TYPE_RETURN {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getOutputType();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_precision_scale_length(n decimal(6,3), v varchar(10))
-            emits (precision1 number, scale1 number, length1 number, precision2 number, scale2 number, length2 number) as
-            class GET_PRECISION_SCALE_LENGTH {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    long precision1 = exa.getInputColumnPrecision(0);
-                    long scale1 = exa.getInputColumnScale(0);
-                    long length1 = exa.getInputColumnLength(0);
-                    long precision2 = exa.getInputColumnPrecision(1);
-                    long scale2 = exa.getInputColumnScale(1);
-                    long length2 = exa.getInputColumnLength(1);
-                    ctx.emit(precision1, scale1, length1, precision2, scale2, length2);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_scope_user() returns varchar(200) as
-            class GET_SCOPE_USER {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getScopeUser();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_script_code() returns varchar(2000) as
-            class GET_SCRIPT_CODE {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getScriptCode();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_script_language() emits (s1 varchar(300), s2 varchar(300)) as
-            class GET_SCRIPT_LANGUAGE {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(exa.getScriptLanguage(), "Java");
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_script_name() returns varchar(200) as
-            class GET_SCRIPT_NAME {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getScriptName();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_script_schema() returns varchar(200) as
-            class GET_SCRIPT_SCHEMA {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getScriptSchema();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_session_id() returns varchar(200) as
-            class GET_SESSION_ID {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getSessionId();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_statement_id() returns number as
-            class GET_STATEMENT_ID {
-                static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getStatementId();
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            create java scalar script
-            get_vm_id() returns varchar(200) as
-            class GET_VM_ID {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return exa.getVmId();
-                }
-            }
-            /
-        '''))
-
-class MetaDataTest(_JavaUdfSetup):
-
-    def test_database_name(self):
-        rows = self.query('''SELECT fn1.get_database_name() FROM DUAL''')
-        self.assertTrue(len(rows[0][0]) > 0)
-
-    def test_database_version(self):
-        rows = self.query('''select fn1.get_database_version() from dual''')
-        self.assertTrue(len(rows[0][0]) > 0)
-
-    def test_script_language(self):
-        rows = self.query('''select fn1.get_script_language() from dual''')
-        self.assertTrue((rows[0][0]).upper().startswith((rows[0][1]).upper()))
-
-    def test_script_name(self):
-        rows = self.query('''select fn1.get_script_name() from dual''')
-        self.assertRowEqual(('GET_SCRIPT_NAME',), rows[0])
-
-    def test_script_schema(self):
-        if (udf.opts.is_compat_mode != "true"):
-            rows = self.query('''select fn1.get_script_schema() from dual''')
-            self.assertRowEqual(('FN1',), rows[0])
-
-    def test_script_user(self):
-        if (udf.opts.is_compat_mode != "true"):
-            rows = self.query('''select fn1.get_current_user() from dual''')
-            self.assertRowEqual(('SYS',), rows[0])
-
-    def test_scope_user(self):
-        if (udf.opts.is_compat_mode != "true"):
-            rows = self.query('''select fn1.get_scope_user() from dual''')
-            self.assertRowEqual(('SYS',), rows[0])
-
-    def test_current_schema_null(self):
-        if (udf.opts.is_compat_mode != "true"):
-            self.query('''CLOSE SCHEMA''')
-            rows = self.query('''select fn1.get_current_schema() from dual''')
-            self.assertRowEqual(('NULL',), rows[0])
-
-    def test_current_schema(self):
-        if (udf.opts.is_compat_mode != "true"):
-            self.query('''create schema test_schema''')
-            rows = self.query('''select fn1.get_current_schema() from dual''')
-            self.assertRowEqual(('TEST_SCHEMA',), rows[0])
-            self.query('''drop schema test_schema cascade''')
-
-    def test_script_code(self):
-        rows = self.query('''select fn1.get_script_code() from dual''')
-        self.assertTrue((rows[0][0]).upper().find('CTX') >= 0)
-
-    def test_session_id(self):
-        rows = self.query('''select fn1.get_session_id() from dual''')
-        self.assertTrue(len(rows[0][0]) > 0)
-
-    def test_statement_id(self):
-        rows = self.query('''select fn1.get_statement_id() from dual''')
-        self.assertTrue(rows[0][0] >= 0)
-
-    def test_node_id(self):
-        rows = self.query('''select fn1.get_node_id() from dual''')
-        self.assertTrue(rows[0][0] >= 0)
-
-    def test_vm_id(self):
-        rows = self.query('''select fn1.get_vm_id() from dual''')
-        self.assertTrue(len(rows[0][0]) > 0)
-
-    def test_input_type_scalar(self):
-        rows = self.query('''select fn1.get_input_type_scalar() from dual''')
-        self.assertRowEqual(('SCALAR',), rows[0])
-
-    def test_input_type_set(self):
-        rows = self.query('''select fn1.get_input_type_set(x) from (values 1,2,3) as t(x)''')
-        self.assertRowEqual(('SET',), rows[0])
-
-    def test_input_column_count_scalar(self):
-        rows = self.query('''select fn1.get_input_column_count_scalar(12.3, 'hihihi') from dual''')
-        self.assertRowEqual((2,), rows[0])
-
-    
-    def test_input_column_count_set(self):
-        rows = self.query('''select fn1.get_input_column_count_set(x, y) from (values (12.3, 'hihihi')) as t(x,y)''')
-        self.assertRowEqual((2,), rows[0])
-
-    def test_input_columns(self):
-        rows = self.query('''select fn1.get_input_columns(1.2, '123') from dual order by column_id''')
-        r0 = rows[0]
-        r1 = rows[1]
-        self.assertTrue(r0[0] == 1)
-        self.assertTrue(r0[1].upper() == 'C1')
-        self.assertTrue(r0[2].upper() == 'NUMBER' or r0[2].upper() == "<TYPE 'FLOAT'>" or r0[2].upper() == "DOUBLE" or r0[2].upper() == "JAVA.LANG.DOUBLE" or r0[2].upper() == "<CLASS 'FLOAT'>")
-        self.assertTrue(r0[3].upper() == 'DOUBLE')
-        self.assertTrue(r1[0] == 2)
-        self.assertTrue(r1[1].upper() == 'C2')
-        self.assertTrue(r1[2].upper() == 'STRING' or r1[2].upper() == "<TYPE 'UNICODE'>" or r1[2].upper() == "CHARACTER" or r1[2].upper() == "JAVA.LANG.STRING" or r1[2].upper() == "<CLASS 'STR'>")
-        self.assertTrue(r1[3].upper().startswith('VARCHAR(200)'))
-        self.assertTrue(r0[6] == 0)
-        self.assertTrue(r1[6] == 200) 
-   
-    def test_output_type_return(self):
-        rows = self.query('''select fn1.get_output_type_return() from dual''')
-        self.assertTrue(rows[0][0] == 'RETURN')
-
-     
-    def test_output_type_emit(self):
-        rows = self.query('''select fn1.get_output_type_emit() from dual''')
-        self.assertTrue(rows[0][0] == 'EMIT')
-
-
-    def test_output_column_count_return(self):
-        rows = self.query('''select fn1.get_output_column_count_return() from dual''')
-        self.assertRowEqual((1,),rows[0])
-
-
-    def test_output_column_count_emit(self):
-        rows = self.query('''select fn1.get_output_column_count_emit() from dual''')
-        self.assertRowEqual((3,3,3),rows[0])
-
-    def test_output_columns(self):
-        rows = self.query('''select fn1.get_output_columns() from dual order by column_id''')
-        r0 = rows[0]
-        r1 = rows[1]
-        r2 = rows[2]
-        r3 = rows[3]
-        r4 = rows[4]
-        r5 = rows[5]
-        r6 = rows[6]
-        self.assertTrue(r0[0] == 1)
-        self.assertTrue(r1[0] == 2)
-        self.assertTrue(r2[0] == 3)
-        self.assertTrue(r3[0] == 4)
-        self.assertTrue(r4[0] == 5)
-        self.assertTrue(r5[0] == 6)
-        self.assertTrue(r6[0] == 7)
-        self.assertTrue(r0[1].upper() == 'COLUMN_ID')
-        self.assertTrue(r1[1].upper() == 'COLUMN_NAME')
-        self.assertTrue(r2[1].upper() == 'COLUMN_TYPE')
-        self.assertTrue(r3[1].upper() == 'COLUMN_SQL_TYPE')
-        self.assertTrue(r4[1].upper() == 'COLUMN_PRECISION')
-        self.assertTrue(r5[1].upper() == 'COLUMN_SCALE')
-        self.assertTrue(r6[1].upper() == 'COLUMN_LENGTH')
-        self.assertTrue(r0[2].upper() == 'NUMBER' or r0[2].upper() == "<TYPE 'FLOAT'>" or r0[2].upper() == "DOUBLE" or r0[2].upper() == "JAVA.LANG.DOUBLE" or r0[2].upper() == "<CLASS 'FLOAT'>")
-        self.assertTrue(r1[2].upper() == 'STRING' or r1[2].upper() == "<TYPE 'UNICODE'>" or r1[2].upper() == "CHARACTER" or r1[2].upper() == "JAVA.LANG.STRING" or r1[2].upper() == "<CLASS 'STR'>")
-        self.assertTrue(r2[2].upper() == 'STRING' or r2[2].upper() == "<TYPE 'UNICODE'>" or r2[2].upper() == "CHARACTER" or r2[2].upper() == "JAVA.LANG.STRING" or r2[2].upper() == "<CLASS 'STR'>")
-        self.assertTrue(r3[2].upper() == 'STRING' or r3[2].upper() == "<TYPE 'UNICODE'>" or r3[2].upper() == "CHARACTER" or r3[2].upper() == "JAVA.LANG.STRING" or r3[2].upper() == "<CLASS 'STR'>")
-        self.assertTrue(r4[2].upper() == 'NUMBER' or r4[2].upper() == "<TYPE 'FLOAT'>" or r4[2].upper() == "DOUBLE" or r4[2].upper() == "JAVA.LANG.DOUBLE" or r4[2].upper() == "<CLASS 'FLOAT'>")
-        self.assertTrue(r5[2].upper() == 'NUMBER' or r5[2].upper() == "<TYPE 'FLOAT'>" or r5[2].upper() == "DOUBLE" or r5[2].upper() == "JAVA.LANG.DOUBLE" or r5[2].upper() == "<CLASS 'FLOAT'>")
-        self.assertTrue(r6[2].upper() == 'NUMBER' or r6[2].upper() == "<TYPE 'FLOAT'>" or r6[2].upper() == "DOUBLE" or r6[2].upper() == "JAVA.LANG.DOUBLE" or r6[2].upper() == "<CLASS 'FLOAT'>")
-        self.assertTrue(r0[3].upper() == 'DOUBLE')
-        self.assertTrue(r1[3].upper().startswith('VARCHAR(200)'))
-        self.assertTrue(r2[3].upper().startswith('VARCHAR(20)'))
-        self.assertTrue(r3[3].upper().startswith('VARCHAR(20)'))
-        self.assertTrue(r4[3].upper() == 'DOUBLE')
-        self.assertTrue(r5[3].upper() == 'DOUBLE')
-        self.assertTrue(r6[3].upper() == 'DOUBLE')
-        self.assertTrue(r1[6] == 200) 
-        self.assertTrue(r2[6] == 20) 
-        self.assertTrue(r3[6] == 20) 
-
-
-
-    def test_precision_scale_length(self):
-        rows = self.query('''select fn1.get_precision_scale_length(2.5, '0123456789') from dual''')
-        self.assertRowEqual((6,3,0,0,0,10), rows[0])
-
-
-    def test_char_length(self):
-        rows = self.query('''select fn1.get_char_length('0123456789') from dual''')
-        self.assertRowEqual((10,20,'9876543210          '), (int(rows[0][0]), int(rows[0][1]), rows[0][2]))
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/generic/java/numeric_functions.py b/test_container/tests/test/generic/java/numeric_functions.py
deleted file mode 100755
index a8663e4..0000000
--- a/test_container/tests/test/generic/java/numeric_functions.py
+++ /dev/null
@@ -1,191 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-
-
-class _JavaUdfSetup(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-        self.query('OPEN SCHEMA FN1')
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            add_three_doubles(x DOUBLE, y DOUBLE, z DOUBLE)
-            RETURNS DOUBLE AS
-            class ADD_THREE_DOUBLES {
-                static Double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getDouble("x") != null && ctx.getDouble("y") != null && ctx.getDouble("z") != null)
-            return (double) ctx.getDouble("x") + (double) ctx.getDouble("y") + (double) ctx.getDouble("z");
-                    return null;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT add_two_doubles(x DOUBLE, y DOUBLE) RETURNS DOUBLE AS
-            class ADD_TWO_DOUBLES {
-                static Double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getDouble("x") != null && ctx.getDouble("y") != null)
-            return (double) ctx.getDouble("x") + (double) ctx.getDouble("y");
-                    return null;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            double_mult("x" double, "y" double)
-            RETURNS double AS
-            class DOUBLE_MULT {
-                static Double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getDouble("x") == null || ctx.getDouble("y") == null)
-            return null;
-                    else
-            return (double) ctx.getDouble("x") * (double) ctx.getDouble("y");
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            pi()
-            RETURNS double AS
-            class PI {
-                static double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return Math.PI;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            split_integer_into_digits("x" INTEGER)
-            EMITS (y INTEGER) AS
-            class SPLIT_INTEGER_INTO_DIGITS {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getInteger("x") != null) {
-            int y = Math.abs(ctx.getInteger("x"));
-            while (y > 0) {
-                ctx.emit(y % 10);
-                y /= 10;
-            }
-                    }
-                }
-            }
-            /
-        '''))
-
-class Test(_JavaUdfSetup):
-    def test_pi(self):
-        rows = self.query('''
-            SELECT fn1.pi()
-                FROM dual''')
-        result = rows[0][0]
-        self.assertAlmostEqual(3.1415926535, result)
-
-    def test_select(self):
-        rows = self.query('''
-            SELECT DISTINCT
-	            FN1.double_mult(float1, float2) = float1 * float2 AS a
-            FROM test.enginetablebig1
-            ORDER BY a
-            ''')
-        self.assertRowsEqual([(True,), (None,)], rows)
-
-    def test_select_into(self):
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-        self.query('CREATE TABLE FN2.t(diff double)')
-        self.query('''
-            INSERT INTO FN2.t
-                SELECT
-                    fn1.double_mult(float1, float2) - float1 * float2 AS a
-                    FROM test.enginetable
-            ''')
-        self.query('''
-            SELECT DISTINCT diff
-                FROM FN2.t
-                WHERE diff != 0 AND diff IS NOT NULL
-            ''')
-        self.assertEqual(0, self.rowcount())
-
-    def test_subselect(self):
-        rows = self.query('''
-            SELECT i, a
-            FROM (
-                SELECT int_index AS i,
-                    (fn1.double_mult(float1, float2) - float1 * float2) AS a
-                FROM test.enginetable)
-            WHERE a IS NOT NULL
-            ORDER BY a
-            LIMIT 20''')
-        for row in rows:
-            rows2 = self.query('''
-                SELECT
-                    float1,
-                    float2,
-                    fn1.double_mult(float1, float2) - float1 * float2 AS a
-                FROM test.enginetable
-                WHERE int_index = ?''',
-                               row.I)
-            self.assertEqual(row.A, rows2[0].A)
-
-    def test_udf_with_two_doubles(self):
-        rows = self.query('''
-            SELECT
-                fn1.add_two_doubles(NULL, NULL) IS NULL,
-                fn1.add_two_doubles(NULL,    0) IS NULL,
-                fn1.add_two_doubles(   0, NULL) IS NULL,
-                fn1.add_two_doubles(0,0) = 0,
-                fn1.add_two_doubles(1,0) = 1,
-                fn1.add_two_doubles(0,2) = 2,
-                fn1.add_two_doubles(2,3) = 5
-            FROM DUAL''')
-        self.assertRowsEqual([tuple([True] * 7)], rows)
-
-    def test_udf_with_three_doubles_part1(self):
-        rows = self.query('''
-            SELECT
-                fn1.add_three_doubles(NULL, NULL, NULL) is NULL,
-                fn1.add_three_doubles(NULL, NULL,    0) is NULL,
-                fn1.add_three_doubles(NULL,    0, NULL) is NULL,
-                fn1.add_three_doubles(   0, NULL, NULL) is NULL,
-                fn1.add_three_doubles(NULL,    0,    0) is NULL
-            FROM DUAL''')
-        self.assertRowsEqual([tuple([True] * 5)], rows)
-
-    def test_udf_with_three_doubles_part2(self):
-        rows = self.query('''
-            SELECT
-                fn1.add_three_doubles(   0, NULL,    0) is NULL,
-                fn1.add_three_doubles(   0,    0, NULL) is NULL,
-                fn1.add_three_doubles(0, 0, 0) = 0,
-                fn1.add_three_doubles(1, 0, 0) = 1,
-                fn1.add_three_doubles(0, 2, 0) = 2
-            FROM DUAL''')
-        self.assertRowsEqual([tuple([True] * 5)], rows)
-
-    def test_udf_with_three_doubles_part3(self):
-        rows = self.query('''
-            SELECT
-                fn1.add_three_doubles(0, 0, 3) = 3,
-                fn1.add_three_doubles(1, 2, 0) = 3,
-                fn1.add_three_doubles(1, 0, 3) = 4,
-                fn1.add_three_doubles(0, 2, 3) = 5,
-                fn1.add_three_doubles(1, 2, 3) = 6
-            FROM DUAL''')
-        self.assertRowsEqual([tuple([True] * 5)], rows)
-
-    def test_right_number_of_emitted_rows(self):
-        rows = self.query('''
-            SELECT fn1.split_integer_into_digits(123)
-            FROM DUAL''')
-        self.assertRowsEqual([(3,), (2,), (1,)], rows)
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/generic/java/pathological_functions.py b/test_container/tests/test/generic/java/pathological_functions.py
deleted file mode 100755
index 522470c..0000000
--- a/test_container/tests/test/generic/java/pathological_functions.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-
-
-class Test(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-        self.query('OPEN SCHEMA FN1')
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            sleep("sec" double)
-            RETURNS double AS
-            class SLEEP {
-                static double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int sec = ctx.getInteger("sec");
-                    Thread.sleep(sec * 1000);
-                    return sec;
-                }
-            }
-            /
-        '''))
-
-    def test_query_timeout(self):
-        self.query('ALTER SESSION SET QUERY_TIMEOUT = 10')
-        try:
-            with self.assertRaisesRegex(Exception, 'Successfully reconnected after query timeout'):
-                self.query('SELECT fn1.sleep(100) FROM dual')
-        finally:
-            self.query('ALTER SESSION SET QUERY_TIMEOUT = 0')
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/generic/java/performance.py b/test_container/tests/test/generic/java/performance.py
deleted file mode 100644
index 407007b..0000000
--- a/test_container/tests/test/generic/java/performance.py
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-from exasol_python_test_framework.udf import timer, skip
-
-
-class _JavaUdfSetup(udf.TestCase):
-
-    def _setup_fn1_schema(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-        self.query('OPEN SCHEMA FN1')
-
-    def _create_wordcount_udfs(self):
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT PERFORMANCE_MAP_WORDS(w VARCHAR(1000))
-            EMITS (w VARCHAR(1000), c INTEGER) AS
-            class PERFORMANCE_MAP_WORDS {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    String text = ctx.getString("w");
-                    if (text != null) {
-                        String[] words = text.split("[^\\\\w]+");
-                        for (String word : words) {
-                            if (!word.isEmpty()) {
-                                ctx.emit(word, 1);
-                            }
-                        }
-                    }
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT PERFORMANCE_REDUCE_COUNTS(w VARCHAR(1000), c INTEGER)
-            EMITS (w VARCHAR(1000), c INTEGER) AS
-            class PERFORMANCE_REDUCE_COUNTS {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    String word = ctx.getString("w");
-                    int count = 0;
-                    do {
-                        if (ctx.getInteger("c") != null) {
-                            count += ctx.getInteger("c");
-                        }
-                    } while (ctx.next());
-                    ctx.emit(word, count);
-                }
-            }
-            /
-        '''))
-
-    def _create_character_udfs(self):
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT PERFORMANCE_MAP_CHARACTERS(text VARCHAR(1000))
-            EMITS (w CHAR(1), c INTEGER) AS
-            class PERFORMANCE_MAP_CHARACTERS {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    String text = ctx.getString("text");
-                    if (text != null) {
-                        for (int i = 0; i < text.length(); i++) {
-                            if (Character.isHighSurrogate(text.charAt(i))) {
-                                ctx.emit(text.substring(i, i + 2), 1);
-                                i++;
-                            } else {
-                                ctx.emit(text.substring(i, i + 1), 1);
-                            }
-                        }
-                    }
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SET SCRIPT PERFORMANCE_REDUCE_CHARACTERS(w CHAR(1), c INTEGER)
-            EMITS (w CHAR(1), c INTEGER) AS
-            class PERFORMANCE_REDUCE_CHARACTERS {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int c = 0;
-                    String w = ctx.getString("w");
-                    if (w != null) {
-                        do {
-                            c += 1;
-                        } while (ctx.next());
-                        ctx.emit(w, c);
-                    }
-                }
-            }
-            /
-        '''))
-
-
-class WordCount(_JavaUdfSetup):
-
-    def setUp(self):
-        self._setup_fn1_schema()
-        self._create_wordcount_udfs()
-
-    def test_word_count(self):
-        sql = '''
-        SELECT COUNT(*) FROM (
-            SELECT fn1.performance_reduce_counts(w, c)
-            FROM (
-                SELECT fn1.performance_map_words(varchar02)
-                FROM test.enginetablebig1
-            )
-            GROUP BY w
-            ORDER BY 1 DESC)'''
-
-        with timer() as t:
-            ret = self.query(sql)
-        print("test_word_count query:", t.duration, repr(ret))
-        self.assertLessEqual(t.duration, 160)
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/generic/java/unicode.py b/test_container/tests/test/generic/java/unicode.py
deleted file mode 100755
index a06b353..0000000
--- a/test_container/tests/test/generic/java/unicode.py
+++ /dev/null
@@ -1,264 +0,0 @@
-#!/usr/bin/env python3
-import csv
-import logging
-import os
-import subprocess
-import sys
-import tempfile
-import unicodedata
-
-from exasol_python_test_framework import udf
-from exasol_python_test_framework.udf import useData
-
-class _JavaUdfSetup(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-        self.query('OPEN SCHEMA FN1')
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            unicode_count(word VARCHAR(1000), convert_ INT)
-            EMITS (uchar VARCHAR(1), count INT) AS
-            import java.util.Map;
-            import java.util.HashMap;
-            import java.util.Set;
-            import java.util.Iterator;
-            class UNICODE_COUNT {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    String s = ctx.getString("word");
-                    if (s == null)
-            return;
-                    if (ctx.getInteger("convert_") > 0)
-            s = s.toUpperCase();
-                    else if (ctx.getInteger("convert_") < 0)
-            s = s.toLowerCase();
-
-                    Map<Integer, Integer> count = new HashMap<Integer, Integer>();
-                    for (int i = 0; i < s.length(); i++) {
-            Integer codepoint = s.codePointAt(i);
-            Integer num = count.get(codepoint);
-            count.put(codepoint, (num == null ? 1 : num + 1));
-            if (Character.isHighSurrogate(s.charAt(i)))
-                i++;
-                    }
-                    Iterator<Map.Entry<Integer, Integer>> iter = count.entrySet().iterator();
-                    while (iter.hasNext()) {
-            Map.Entry<Integer, Integer> item = iter.next();
-            ctx.emit(new String(Character.toChars(item.getKey())), item.getValue());
-                    }
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            unicode_len(word VARCHAR(1000))
-            RETURNS INT AS
-            class UNICODE_LEN {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    String s = ctx.getString("word");
-                    return (s == null) ? 0 : s.codePointCount(0, s.length());
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            unicode_upper(word VARCHAR(1000))
-            RETURNS VARCHAR(1000) AS
-            class UNICODE_UPPER {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    String s = ctx.getString("word");
-                    return (s == null) ? null : s.toUpperCase();
-                }
-            }
-            /
-        '''))
-
-
-def setUpModule():
-    log = logging.getLogger('unicodedata')
-
-    log.info('generating unicodedata CSV')
-    with tempfile.NamedTemporaryFile(prefix='unicode-', suffix='.csv', encoding='utf-8', mode='w+',
-                                     delete=False) as csvfile:
-        c = csv.writer(csvfile, quoting=csv.QUOTE_ALL)
-        for i in range(sys.maxunicode + 1):
-            if i >= 5024 and i <= 5119:
-                continue  # the Unicode Cherokee-Block is broken in Python 2.7 and Python 3.4 (maybe also 3.5)
-            u = chr(i)
-            if unicodedata.category(u).startswith('C'):
-                # [Cc]Other, Control
-                # [Cf]Other, Format
-                # [Cn]Other, Not Assigned
-                # [Co]Other, Private Use
-                # [Cs]Other, Surrogate
-                continue
-            row = (i,  # INT 0-1114111
-                   unicodedata.name(u, 'UNICODE U+%08X' % i),  # VARCHAR(100) ASCII
-                   u,  # VARCHAR(1) UNICODE
-                   u.upper(),  # VARCHAR(1) UNICODE
-                   u.lower(),  # VARCHAR(1) UNICODE
-                   unicodedata.decimal(u, None),  # INT
-                   unicodedata.numeric(u, None),  # DOUBLE
-                   unicodedata.category(u),  # VARCHAR(3) ASCII
-                   unicodedata.bidirectional(u),  # VARCHAR(3) ASCII
-                   unicodedata.combining(u),  # VARCHAR(3) ASCII
-                   unicodedata.east_asian_width(u),  # VARCHAR(1) ASCII
-                   bool(unicodedata.mirrored),  # BOOLEAN
-                   unicodedata.decomposition(u),  # VARCHAR(10) ASCII
-                   unicodedata.normalize('NFC', u),  # VARCHAR(3) UNICODE
-                   unicodedata.normalize('NFD', u),  # VARCHAR(3) UNICODE
-                   unicodedata.normalize('NFKC', u),  # VARCHAR(3) UNICODE
-                   unicodedata.normalize('NFKD', u),  # VARCHAR(3) UNICODE
-                   )
-            c.writerow(row)
-        csvfile.flush()
-
-        log.info('loading CSV')
-        sql = '''
-            DROP SCHEMA utest CASCADE;
-            CREATE SCHEMA utest;
-            CREATE TABLE utest.unicodedata (
-                codepoint INT NOT NULL,
-                name VARCHAR(100) ASCII,
-                uchar VARCHAR(1) UTF8,
-                to_upper VARCHAR(1) UTF8,
-                to_lower VARCHAR(1) UTF8,
-                decimal_value INT,
-                numeric_value INT,
-                category VARCHAR(3) ASCII,
-                bidirectional VARCHAR(3) ASCII,
-                combining VARCHAR(10) ASCII,
-                east_asian_width VARCHAR(2) ASCII,                mirrored BOOLEAN,
-                decomposition VARCHAR(100) ASCII,
-                NFC VARCHAR(10) UTF8,
-                NFD VARCHAR(10) UTF8,
-                NFKC VARCHAR(20) UTF8,
-                NFKD VARCHAR(20) UTF8
-                );
-            IMPORT INTO utest.unicodedata
-            FROM LOCAL CSV FILE '%s'
-            ROW SEPARATOR = 'CRLF';
-            ''' % os.path.join(os.getcwd(), csvfile.name)
-        cmd = '''%(exaplus)s -c %(conn)s -u sys -P exasol
-		        -no-config -autocommit ON -L -pipe -jdbcparam validateservercertificate=0''' % {
-            'exaplus': os.environ.get('EXAPLUS',
-                                      '/usr/opt/EXASuite-4/EXASolution-4.2.9/bin/Console/exaplus'),
-            'conn': udf.opts.server
-        }
-        env = os.environ.copy()
-        env['PATH'] = '/usr/opt/jdk1.8.0_latest/bin:' + env['PATH']
-        exaplus = subprocess.Popen(
-            cmd.split(),
-            env=env,
-            stdin=subprocess.PIPE,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT)
-        out, _err = exaplus.communicate(sql.encode('utf-8'))
-    if exaplus.returncode != 0 or _err is not None:
-        log.critical('EXAplus error: %d', exaplus.returncode)
-        log.error(out)
-    else:
-        log.debug(out)
-
-
-def add_uniname(data):
-    return [(n, unicodedata.name(chr(n), 'U+%04X' % n))
-            for n in data]
-
-
-class Unicode(_JavaUdfSetup):
-
-    def query_unicode_char(self, u):
-        rows = self.query('''
-            SELECT count, unicode(uchar) AS u
-            FROM (
-                SELECT fn1.unicode_count(unicodechr(%d), 0)
-                FROM dual)
-            ''' % u)
-        self.assertEqual(1, self.rowcount())
-        self.assertEqual(1, rows[0].COUNT)
-        self.assertEqual(u, rows[0].U)
-
-    data = add_uniname((
-        65,
-        255,
-        382,
-        65279,
-        63882,
-        65534,
-        66432,
-        173746,
-        1114111,
-    ))
-
-    @useData(data)
-    def test_unicode(self, codepoint, _name):
-        self.query_unicode_char(codepoint)
-
-    def test_unicode_count(self):
-        self.maxDiff = 1024
-        rows = self.query('''
-            SELECT
-                c1_integer AS i,
-                len(c2_varchar100) AS len_exa,
-                fn1.unicode_len(c2_varchar100) AS len
-            FROM test.enginetablebigunicodevarchar
-            WHERE len(c2_varchar100) != fn1.unicode_len(c2_varchar100)
-            ORDER BY c1_integer
-            LIMIT 100
-            ''')
-        self.assertRowsEqual([], rows)
-
-
-class UnicodeData(_JavaUdfSetup):
-
-    def test_unicode_upper_is_subset_of_Unicode520_part2(self):
-        rows = self.query('''
-            SELECT
-                codepoint,
-                name,
-                unicode(to_upper),
-                unicode(fn1.unicode_upper(uchar))
-            FROM utest.unicodedata
-            WHERE codepoint in (181, 8126)
-                and (to_upper != fn1.unicode_upper(uchar))
-                and (uchar != fn1.unicode_upper(uchar))
-            ORDER BY codepoint
-            LIMIT 50
-            ''')
-        self.assertRowsEqual([], rows)
-
-    def test_unicode_upper_is_subset_of_Unicode520_part3(self):
-        rows = self.query('''
-            SELECT
-                codepoint,
-                name,
-                unicode(to_upper),
-                unicode(fn1.unicode_upper(uchar))
-            FROM utest.unicodedata
-            WHERE codepoint in (1010)
-                and (to_upper != fn1.unicode_upper(uchar))
-                and (uchar != fn1.unicode_upper(uchar))
-            ORDER BY codepoint
-            LIMIT 50
-            ''')
-        self.assertRowsEqual([], rows)
-
-    def test_unicode_len(self):
-        rows = self.query('''
-            SELECT codepoint, name
-            FROM utest.unicodedata
-            WHERE codepoint not between 55296 and 57343
-                and len(uchar) != fn1.unicode_len(uchar)
-            ORDER BY codepoint
-            LIMIT 100
-            ''')
-        self.assertRowsEqual([], rows)
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/generic/java/vectorsize.py b/test_container/tests/test/generic/java/vectorsize.py
deleted file mode 100755
index 026e4ef..0000000
--- a/test_container/tests/test/generic/java/vectorsize.py
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-from exasol_python_test_framework.udf import useData
-
-
-class _JavaUdfSetup(udf.TestCase):
-    LANG = 'java'
-    def setUp(self):
-        self.query('DROP SCHEMA FN1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN1')
-        self.query('OPEN SCHEMA FN1')
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            basic_range(n INTEGER)
-            EMITS (n INTEGER) AS
-            class BASIC_RANGE {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    if (ctx.getInteger("n") != null)
-            for (int i = 0; i < ctx.getInteger("n"); i++)
-                ctx.emit(i);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT
-            vectorsize(length DOUBLE, dummy DOUBLE)
-            RETURNS VARCHAR(2000000) AS
-            import java.util.Map;
-            import java.util.HashMap;
-
-            class VECTORSIZE {
-                static Map<Integer, String> cache = new HashMap<Integer, String>();
-
-                static void fillCache(int len) {
-                    StringBuilder sb = new StringBuilder();
-                    for (int i = 0; i < len; i++) {
-            sb.append(Integer.toString(i));
-                    }
-                    cache.put(len, sb.toString());
-                }
-
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int len = ctx.getInteger("length");
-                    if (!cache.containsKey(len))
-            fillCache(len);
-                    return cache.get(len);
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT vectorsize5000(A DOUBLE)
-            RETURNS VARCHAR(2000000) AS
-            class VECTORSIZE5000 {
-                static String numbers;
-
-                static {
-                    StringBuilder sb = new StringBuilder();
-                    for (int i = 0; i < 5000; i++) {
-            sb.append(Integer.toString(i));
-                    }
-                    numbers = sb.toString();
-                }
-
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return numbers;
-                }
-            }
-            /
-        '''))
-
-        self.query(udf.fixindent('''
-            CREATE JAVA SCALAR SCRIPT
-            vectorsize_set(length DOUBLE, n DOUBLE, dummy DOUBLE)
-            EMITS (o VARCHAR(2000000)) AS
-            import java.util.Map;
-            import java.util.HashMap;
-
-            class VECTORSIZE_SET {
-                static Map<Integer, String> cache = new HashMap<Integer, String>();
-
-                static void fillCache(int len) {
-                    StringBuilder sb = new StringBuilder();
-                    for (int i = 0; i < len; i++) {
-            sb.append(Integer.toString(i));
-                    }
-                    cache.put(len, sb.toString());
-                }
-
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int len = ctx.getInteger("length");
-                    if (!cache.containsKey(len))
-            fillCache(len);
-                    int n = ctx.getInteger("n");
-                    for (int i = 0; i < n; i++) {
-            ctx.emit(cache.get(len));
-                    }
-                }
-            }
-            /
-        '''))
-
-class Vectorsize(_JavaUdfSetup):
-
-    def test_vectorsize_5000(self):
-        self.query('''
-		        SELECT max(fn1.vectorsize5000(float1))
-                FROM TEST.ENGINETABLEBIG1''')
-
-    data = [
-            (10,),
-            (30,),
-            (100,),
-            (300,),
-            (1000,),
-            (3000,),
-            (10000,),
-            (30000,),
-            (100000,),
-            (200000,),
-            (351850,),
-            ]
-
-    @useData(data)
-    def test_vectorsize(self, size):
-        if size > 3000:
-            raise udf.SkipTest('test is to slow')
-
-        self.query('''
-                SELECT max(fn1.vectorsize(%d, float1))
-                FROM TEST.ENGINETABLEBIG1
-                ''' % size)
-
-    data = [
-            (10, 10, 10),
-            (100, 100, 100),
-            (1000, 100, 100),
-            (10000, 100, 100),
-            (100000, 100, 100),
-            (351850, 100, 100),
-            (100, 10, 100000),
-            (100, 100, 10000),
-            (100, 1000, 1000),
-            (100, 10000, 100),
-            (100, 100000, 10),
-            ]
-
-    @useData(data)
-    def test_vectorsize_set(self, a, b, c):
-        q = '''
-                SELECT max(o)
-                FROM (
-                    SELECT fn1.vectorsize_set(%d, %d, n)
-                    FROM (
-                        SELECT fn1.basic_range(%d)
-                        FROM DUAL
-                    )
-                )
-                ''' % (a, b, c)
-        self.query(q)
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/generic/python3/dynamic_input.py b/test_container/tests/test/generic/python3/dynamic_input.py
index d61fa53..77b1570 100755
--- a/test_container/tests/test/generic/python3/dynamic_input.py
+++ b/test_container/tests/test/generic/python3/dynamic_input.py
@@ -171,11 +171,11 @@ def test_meta_scalar_emit(self):
             ''')
         self.assertRowEqual(('2',), rows[0])
         self.assertRowEqual(('0',), rows[1])
-        self.assertTrue(rows[2][0] == "string" or rows[2][0] == "<type 'unicode'>" or rows[2][0] == "character" or rows[2][0] == "java.lang.String" or rows[2][0] == "<class 'str'>")
+        self.assertTrue(rows[2][0] == "string" or rows[2][0] == "<type 'unicode'>" or rows[2][0] == "character" or rows[2][0] == "<class 'str'>")
         self.assertRowEqual(('CHAR(3) ASCII',), rows[3])
         self.assertRowEqual(('3',), rows[6])
         self.assertRowEqual(('1',), rows[7])
-        self.assertTrue(rows[8][0] == 'number' or rows[8][0] == "<type 'float'>" or rows[8][0] == "double" or rows[8][0] == "java.lang.Double" or rows[8][0] == "<class 'float'>")
+        self.assertTrue(rows[8][0] == 'number' or rows[8][0] == "<type 'float'>" or rows[8][0] == "double" or rows[8][0] == "<class 'float'>")
         self.assertRowEqual(('DOUBLE',), rows[9])
 
 
@@ -312,7 +312,6 @@ def test_exception_wrong_arg(self):
         err_text = {
             'lua': 'out of range',
             'python3': 'does not exist',
-            'java': 'does not exist',
             }
         with self.assertRaisesRegex(Exception, err_text[self.LANG]):
             self.query('''select fn1.wrong_arg('a') from dual''')
@@ -322,7 +321,6 @@ def test_exception_wrong_operation(self):
             'lua': 'attempt to perform arithmetic on field',
             'r': 'non-numeric argument to binary operator',
             'python3': 'multiply sequence by non-int of type',
-            'java': 'bad operand types for binary operator',
             }
         with self.assertRaisesRegex(Exception, err_text[self.LANG]):
             self.query('''select fn1.wrong_operation('a','b') from dual''')
diff --git a/test_container/tests/test/generic/python3/dynamic_output.py b/test_container/tests/test/generic/python3/dynamic_output.py
index c1b5b70..08f11db 100755
--- a/test_container/tests/test/generic/python3/dynamic_output.py
+++ b/test_container/tests/test/generic/python3/dynamic_output.py
@@ -341,13 +341,11 @@ def test_metadata_correctness(self):
             'python3': ["<type 'unicode'>", "<class 'str'>"],
             'r': ["character"],
             'lua': ["string"],
-            'java': ["java.lang.String"]
         }
         numType = {
             'python3': ["<type 'float'>", "<class 'float'>"],
             'r': ["double"],
             'lua': ["number"],
-            'java': ["java.lang.Double"]
         }
         self.assertRowEqual(('2',1.0), rows[0])
         self.assertRowEqual(('A',1.0), rows[1])
@@ -579,13 +577,11 @@ def test_metadata_correctness(self):
             'python3': ["<type 'unicode'>", "<class 'str'>"],
             'r': ["character"],
             'lua': ["string"],
-            'java': ["java.lang.String"]
         }
         numType = {
             'python3': ["<type 'float'>", "<class 'float'>"],
             'r': ["double"],
             'lua': ["number"],
-            'java': ["java.lang.Double"]
         }
         self.assertRowEqual(('2',1.0), rows[0])
         self.assertRowEqual(('A',1.0), rows[1])
diff --git a/test_container/tests/test/generic/python3/metadata.py b/test_container/tests/test/generic/python3/metadata.py
index 6f3b6c7..f039e6c 100755
--- a/test_container/tests/test/generic/python3/metadata.py
+++ b/test_container/tests/test/generic/python3/metadata.py
@@ -340,11 +340,11 @@ def test_input_columns(self):
         r1 = rows[1]
         self.assertTrue(r0[0] == 1)
         self.assertTrue(r0[1].upper() == 'C1')
-        self.assertTrue(r0[2].upper() == 'NUMBER' or r0[2].upper() == "<TYPE 'FLOAT'>" or r0[2].upper() == "DOUBLE" or r0[2].upper() == "JAVA.LANG.DOUBLE" or r0[2].upper() == "<CLASS 'FLOAT'>")
+        self.assertTrue(r0[2].upper() == 'NUMBER' or r0[2].upper() == "<TYPE 'FLOAT'>" or r0[2].upper() == "DOUBLE" or r0[2].upper() == "<CLASS 'FLOAT'>")
         self.assertTrue(r0[3].upper() == 'DOUBLE')
         self.assertTrue(r1[0] == 2)
         self.assertTrue(r1[1].upper() == 'C2')
-        self.assertTrue(r1[2].upper() == 'STRING' or r1[2].upper() == "<TYPE 'UNICODE'>" or r1[2].upper() == "CHARACTER" or r1[2].upper() == "JAVA.LANG.STRING" or r1[2].upper() == "<CLASS 'STR'>")
+        self.assertTrue(r1[2].upper() == 'STRING' or r1[2].upper() == "<TYPE 'UNICODE'>" or r1[2].upper() == "CHARACTER" or r1[2].upper() == "<CLASS 'STR'>")
         self.assertTrue(r1[3].upper().startswith('VARCHAR(200)'))
         self.assertTrue(r0[6] == 0)
         self.assertTrue(r1[6] == 200) 
@@ -391,13 +391,13 @@ def test_output_columns(self):
         self.assertTrue(r4[1].upper() == 'COLUMN_PRECISION')
         self.assertTrue(r5[1].upper() == 'COLUMN_SCALE')
         self.assertTrue(r6[1].upper() == 'COLUMN_LENGTH')
-        self.assertTrue(r0[2].upper() == 'NUMBER' or r0[2].upper() == "<TYPE 'FLOAT'>" or r0[2].upper() == "DOUBLE" or r0[2].upper() == "JAVA.LANG.DOUBLE" or r0[2].upper() == "<CLASS 'FLOAT'>")
-        self.assertTrue(r1[2].upper() == 'STRING' or r1[2].upper() == "<TYPE 'UNICODE'>" or r1[2].upper() == "CHARACTER" or r1[2].upper() == "JAVA.LANG.STRING" or r1[2].upper() == "<CLASS 'STR'>")
-        self.assertTrue(r2[2].upper() == 'STRING' or r2[2].upper() == "<TYPE 'UNICODE'>" or r2[2].upper() == "CHARACTER" or r2[2].upper() == "JAVA.LANG.STRING" or r2[2].upper() == "<CLASS 'STR'>")
-        self.assertTrue(r3[2].upper() == 'STRING' or r3[2].upper() == "<TYPE 'UNICODE'>" or r3[2].upper() == "CHARACTER" or r3[2].upper() == "JAVA.LANG.STRING" or r3[2].upper() == "<CLASS 'STR'>")
-        self.assertTrue(r4[2].upper() == 'NUMBER' or r4[2].upper() == "<TYPE 'FLOAT'>" or r4[2].upper() == "DOUBLE" or r4[2].upper() == "JAVA.LANG.DOUBLE" or r4[2].upper() == "<CLASS 'FLOAT'>")
-        self.assertTrue(r5[2].upper() == 'NUMBER' or r5[2].upper() == "<TYPE 'FLOAT'>" or r5[2].upper() == "DOUBLE" or r5[2].upper() == "JAVA.LANG.DOUBLE" or r5[2].upper() == "<CLASS 'FLOAT'>")
-        self.assertTrue(r6[2].upper() == 'NUMBER' or r6[2].upper() == "<TYPE 'FLOAT'>" or r6[2].upper() == "DOUBLE" or r6[2].upper() == "JAVA.LANG.DOUBLE" or r6[2].upper() == "<CLASS 'FLOAT'>")
+        self.assertTrue(r0[2].upper() == 'NUMBER' or r0[2].upper() == "<TYPE 'FLOAT'>" or r0[2].upper() == "DOUBLE" or r0[2].upper() == "<CLASS 'FLOAT'>")
+        self.assertTrue(r1[2].upper() == 'STRING' or r1[2].upper() == "<TYPE 'UNICODE'>" or r1[2].upper() == "CHARACTER" or r1[2].upper() == "<CLASS 'STR'>")
+        self.assertTrue(r2[2].upper() == 'STRING' or r2[2].upper() == "<TYPE 'UNICODE'>" or r2[2].upper() == "CHARACTER" or r2[2].upper() == "<CLASS 'STR'>")
+        self.assertTrue(r3[2].upper() == 'STRING' or r3[2].upper() == "<TYPE 'UNICODE'>" or r3[2].upper() == "CHARACTER" or r3[2].upper() == "<CLASS 'STR'>")
+        self.assertTrue(r4[2].upper() == 'NUMBER' or r4[2].upper() == "<TYPE 'FLOAT'>" or r4[2].upper() == "DOUBLE" or r4[2].upper() == "<CLASS 'FLOAT'>")
+        self.assertTrue(r5[2].upper() == 'NUMBER' or r5[2].upper() == "<TYPE 'FLOAT'>" or r5[2].upper() == "DOUBLE" or r5[2].upper() == "<CLASS 'FLOAT'>")
+        self.assertTrue(r6[2].upper() == 'NUMBER' or r6[2].upper() == "<TYPE 'FLOAT'>" or r6[2].upper() == "DOUBLE" or r6[2].upper() == "<CLASS 'FLOAT'>")
         self.assertTrue(r0[3].upper() == 'DOUBLE')
         self.assertTrue(r1[3].upper().startswith('VARCHAR(200)'))
         self.assertTrue(r2[3].upper().startswith('VARCHAR(20)'))
diff --git a/test_container/tests/test/generic/python3/vectorsize.py b/test_container/tests/test/generic/python3/vectorsize.py
index 30c3456..20c54be 100755
--- a/test_container/tests/test/generic/python3/vectorsize.py
+++ b/test_container/tests/test/generic/python3/vectorsize.py
@@ -111,8 +111,7 @@ def test_vectorsize(self, size):
         limits = {
             'lua':      100000,
             'python3':   8000,
-            'r':        3000,
-            'java':     3000
+            'r':        3000
             }
         if size > limits.get(self.LANG, sys.maxsize):
             raise udf.SkipTest('test is to slow')
diff --git a/test_container/tests/test/generic/r/vectorsize.py b/test_container/tests/test/generic/r/vectorsize.py
index 1d7849c..717b5ec 100644
--- a/test_container/tests/test/generic/r/vectorsize.py
+++ b/test_container/tests/test/generic/r/vectorsize.py
@@ -76,7 +76,6 @@ def test_vectorsize(self, size):
             'lua': 100000,
             'python3': 8000,
             'r': 3000,
-            'java': 3000,
         }
         if size > limits.get('r', sys.maxsize):
             raise SkipTest('test is to slow')
diff --git a/test_container/tests/test/java/bugs.py b/test_container/tests/test/java/bugs.py
deleted file mode 100755
index 2874327..0000000
--- a/test_container/tests/test/java/bugs.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-
-
-class JavaBugsTest(udf.TestCase):
-    def setUp(self):
-        self.schema=self.__class__.__name__
-        self.query('DROP SCHEMA %s CASCADE'%self.schema, ignore_errors=True)
-        self.query('CREATE SCHEMA %s'%self.schema, ignore_errors=True)
-        self.query('OPEN SCHEMA %s'%self.schema)
-
-    def test_java_emits_null(self):
-        self.query(udf.fixindent('''
-        CREATE OR REPLACE JAVA SCALAR SCRIPT JAVA_EMITS() EMITS(i INT) AS
-            class JAVA_EMITS {
-                static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    ctx.emit(null);
-                }
-            }
-            '''))
-        self.query("select JAVA_EMITS();")
-
-    def tearDown(self):
-        self.query('DROP SCHEMA %s CASCADE'%self.schema, ignore_errors=True)
-
-
-if __name__ == '__main__':
-    udf.main()
-
diff --git a/test_container/tests/test/java/context.py b/test_container/tests/test/java/context.py
deleted file mode 100644
index 39f2b73..0000000
--- a/test_container/tests/test/java/context.py
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-
-
-NUM_ROW_INSERTS = 15
-PAYLOAD = '0123456789ABCDEF0123456789ABCDEF'
-
-
-class CtxSizeAPITest(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA context_api CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA context_api')
-
-        self.query('''
-            CREATE OR REPLACE TABLE ctx_size_input(
-                a VARCHAR(32),
-                i DECIMAL(9,0)
-            )
-        ''')
-        self.query(f'''
-            INSERT INTO ctx_size_input VALUES ('{PAYLOAD}', 0)
-        ''')
-        self.query(f'''
-            INSERT INTO ctx_size_input VALUES ('{PAYLOAD}', 1)
-        ''')
-        self._duplicate_rows('ctx_size_input', 'a, i')
-        self.commit()
-
-    def _duplicate_rows(self, table_name, column_names):
-        for i in range(NUM_ROW_INSERTS):
-            self.query(
-                f'INSERT INTO {table_name} ({column_names}) '
-                f'SELECT {column_names} FROM {table_name}'
-            )
-
-    def test_ctx_size_scalar_udf(self):
-        self.query(udf.fixindent('''
-            CREATE OR REPLACE JAVA SCALAR SCRIPT
-            SCALAR_CTX_SIZE(a VARCHAR(32))
-            RETURNS INTEGER AS
-            class SCALAR_CTX_SIZE{
-                static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return ctx.size();
-                }
-            }
-            /
-        '''))
-
-        rows = self.query('''
-            SELECT MAX(scalar_ctx_size(a))
-            FROM ctx_size_input
-        ''')
-        self.assertRowsEqual([(2048,)], rows)
-
-    def test_ctx_size_set_udf(self):
-        self.query(udf.fixindent('''
-            CREATE OR REPLACE JAVA SET SCRIPT
-            set_ctx_size(a VARCHAR(32), i INTEGER)
-            RETURNS INTEGER AS
-
-            class SET_CTX_SIZE{
-                static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return ctx.size();
-                }
-            }
-        '''))
-
-        rows = self.query('''
-            SELECT set_ctx_size(a, i)
-            FROM ctx_size_input
-            GROUP BY i
-        ''')
-        self.assertRowsEqual([(32768,), (32768,)], rows)
-
-
-class CtxGetitemAPITest(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA context_api CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA context_api')
-
-    def test_ctx_get_object_by_name(self):
-        self.query('''
-            CREATE OR REPLACE TABLE t(
-                "a" VARCHAR(10000)
-            )
-        ''')
-        self.query('''
-            INSERT INTO t VALUES ('x')
-        ''')
-
-        self.query(udf.fixindent('''
-            CREATE OR REPLACE JAVA SCALAR SCRIPT
-            SCALAR_GET_OBJECT("a" VARCHAR(10000))
-            RETURNS VARCHAR(1000) AS
-            class SCALAR_GET_OBJECT {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return (String)ctx.getObject("a");
-                }
-            }
-            
-        '''))
-
-        rows = self.query('SELECT SCALAR_GET_OBJECT("a") FROM t')
-        self.assertRowsEqual([('x',)], rows)
-
-    def test_ctx_get_object_by_index(self):
-        self.query('''
-            CREATE OR REPLACE TABLE t(
-                "a" VARCHAR(10000)
-            )
-        ''')
-        self.query('''
-                   INSERT INTO t
-                   VALUES ('x')
-                   ''')
-
-        self.query(udf.fixindent('''
-            CREATE OR REPLACE JAVA SCALAR SCRIPT
-            SCALAR_GET_OBJECT("a" VARCHAR(10000))
-            RETURNS VARCHAR(1000) AS
-            class SCALAR_GET_OBJECT {
-                static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return (String)ctx.getObject(0);
-                }
-            }
-
-        '''))
-
-        rows = self.query('SELECT SCALAR_GET_OBJECT("a") FROM t')
-        self.assertRowsEqual([('x',)], rows)
-
-if __name__ == '__main__':
-    udf.main()
\ No newline at end of file
diff --git a/test_container/tests/test/java/exceptions.py b/test_container/tests/test/java/exceptions.py
deleted file mode 100755
index 91bde12..0000000
--- a/test_container/tests/test/java/exceptions.py
+++ /dev/null
@@ -1,265 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-from pyodbc import DataError
-
-
-class ExceptionTest(udf.TestCase):
-
-    def setUp(self):
-        self.query('CREATE SCHEMA T1', ignore_errors=True)
-        self.query('OPEN SCHEMA T1')
-
-    def test_single_call(self):
-        exception = None
-        self.query(udf.fixindent('''
-                create or replace java scalar script
-                throw_exception_in_singlecall()
-                EMITS (...) AS
-                
-                class THROW_EXCEPTION_IN_SINGLECALL {
-                    public static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        ctx.emit(1);
-                    }
-                    
-                  static String getDefaultOutputColumns(ExaMetadata exa) throws Exception {
-                    throw new RuntimeException("Error");
-                  }
-                }
-                '''))
-
-        try:
-            self.query("SELECT T1.THROW_EXCEPTION_IN_SINGLECALL() FROM DUAL")
-        except DataError as ex:
-            exception = ex
-        self._verify_exception(exception,
-                               expected_list=[
-                                   "VM error",
-                                   "com.exasol.ExaUDFException: F-UDF-CL-SL-JAVA-1068: "
-                                   "Exception during singleCall getDefaultOutputColumns",
-                                   "java.lang.RuntimeException: Error",
-                                   "com.exasol.THROW_EXCEPTION_IN_SINGLECALL.getDefaultOutputColumns",
-                                   "com.exasol.ExaWrapper.runSingleCall"],
-                               not_expected_strings=["jdk.internal.reflect",
-                                                     "InvocationTargetException",
-                                                     "MalformedParameterizedTypeException",
-                                                     "UndeclaredThrowableException"])
-
-    def test_get_integer(self):
-        exception = None
-        self.query(udf.fixindent('''
-                create or replace java scalar script
-                error_in_get_integer()
-                EMITS (firstname VARCHAR(100), lastname VARCHAR(100)) AS
-                class ERROR_IN_GET_INTEGER {
-                    public static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        ctx.getInteger("ABC");
-                    }
-                }
-                '''))
-        try:
-            self.query("SELECT T1.error_in_get_integer() FROM DUAL")
-        except DataError as ex:
-            exception = ex
-
-        self._verify_exception(exception,
-                               expected_list=[
-                                   "VM error",
-                                   "com.exasol.ExaUDFException: ",
-                                   "com.exasol.ExaIterationException: E-UDF-CL-SL-JAVA-1123: "
-                                   "Column with name 'ABC' does not exist",
-                                   "com.exasol.ExaIteratorImpl.getInteger",
-                                   "com.exasol.ERROR_IN_GET_INTEGER.run",
-                                   "com.exasol.ExaWrapper.run"],
-                               not_expected_strings=["jdk.internal.reflect",
-                                                     "InvocationTargetException",
-                                                     "MalformedParameterizedTypeException",
-                                                     "UndeclaredThrowableException"])
-
-    def test_get_connection(self):
-        exception = None
-        self.query(udf.fixindent('''
-                create or replace java scalar script
-                error_in_get_connection()
-                EMITS (firstname VARCHAR(100), lastname VARCHAR(100)) AS
-                class ERROR_IN_GET_CONNECTION {
-                    public static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        exa.getConnection("ABC");
-                    }
-                }
-                '''))
-        try:
-            self.query("SELECT T1.error_in_get_connection() FROM DUAL")
-        except DataError as ex:
-            exception = ex
-
-        self._verify_exception(exception,
-                               expected_list=[
-                                   "VM error",
-                                   "com.exasol.ExaUDFException: ",
-                                   "com.exasol.ExaConnectionAccessException: E-UDF-CL-SL-JAVA-1099: "
-                                   "connection ABC does not exist",
-                                   "com.exasol.ExaMetadataImpl.getConnection",
-                                   "com.exasol.ERROR_IN_GET_CONNECTION.run",
-                                   "com.exasol.ExaWrapper.run"],
-                               not_expected_strings=["jdk.internal.reflect",
-                                                     "InvocationTargetException",
-                                                     "MalformedParameterizedTypeException",
-                                                     "UndeclaredThrowableException"])
-
-
-    def test_throw_exception(self):
-        exception = None
-        self.query(udf.fixindent('''
-                create or replace java scalar script
-                throw_exception()
-                EMITS (firstname VARCHAR(100), lastname VARCHAR(100)) AS
-                class THROW_EXCEPTION {
-                    public static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        try {
-                            throw new RuntimeException("Error");
-                        } catch (final Exception ex) {
-                            throw new RuntimeException("Got exception", ex);
-                        }
-                    }
-                }
-                '''))
-
-        try:
-            self.query("SELECT T1.throw_exception() FROM DUAL")
-        except DataError as ex:
-            exception = ex
-        self._verify_exception(exception,
-                               expected_list=[
-                                   "VM error",
-                                   "com.exasol.ExaUDFException: F-UDF-CL-SL-JAVA-1080:",
-                                   "java.lang.RuntimeException: Got exception",
-                                   "com.exasol.THROW_EXCEPTION.run",
-                                   "com.exasol.ExaWrapper.run",
-                                   "Caused by: java.lang.RuntimeException: Error",
-                                   "com.exasol.THROW_EXCEPTION.run",
-                                   "... 1 more"],
-                               not_expected_strings=["jdk.internal.reflect",
-                                                     "InvocationTargetException",
-                                                     "MalformedParameterizedTypeException",
-                                                     "UndeclaredThrowableException"])
-
-
-    def test_get_integer(self):
-        exception = None
-        self.query(udf.fixindent('''
-                create or replace java scalar script
-                error_in_get_integer()
-                EMITS (firstname VARCHAR(100), lastname VARCHAR(100)) AS
-                class ERROR_IN_GET_INTEGER {
-                    public static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        ctx.getInteger("ABC");
-                    }
-                }
-                '''))
-        try:
-            self.query("SELECT T1.error_in_get_integer() FROM DUAL")
-        except DataError as ex:
-            exception = ex
-
-        self._verify_exception(exception,
-                               expected_list=[
-                                   "VM error",
-                                   "com.exasol.ExaUDFException: ",
-                                   "com.exasol.ExaIterationException: E-UDF-CL-SL-JAVA-1123: Column with name "
-                                   "'ABC' does not exist",
-                                   "com.exasol.ExaIteratorImpl.getInteger",
-                                   "com.exasol.ERROR_IN_GET_INTEGER.run",
-                                   "com.exasol.ExaWrapper.run"],
-                               not_expected_strings=["jdk.internal.reflect",
-                                                     "InvocationTargetException",
-                                                     "MalformedParameterizedTypeException",
-                                                     "UndeclaredThrowableException"])
-
-
-    def test_do_not_filter_user_reflection(self):
-        """
-            User code reflection code stack traces must not be filtered!
-        """
-        exception = None
-        self.query(udf.fixindent('''
-                create or replace java scalar script
-                throw_exception_in_user_code_within_reflection()
-                EMITS (firstname VARCHAR(100), lastname VARCHAR(100)) AS
-                import java.lang.Exception;
-                import java.lang.reflect.Constructor;
-                import java.lang.reflect.InvocationTargetException;
-                import java.lang.reflect.Method;
-                final class CustomTestException extends Exception {
-                    public CustomTestException(final String msg, final Throwable th) {
-                        super(msg, th);
-                    }
-                }
-
-                final class CustomTestClass {
-                    public CustomTestClass() {}
-                
-                    public void throwEx() throws CustomTestException {
-                        try {
-                            try {
-                                throw new RuntimeException("ex1");
-                            } catch (final RuntimeException ex) {
-                                throw new RuntimeException("ex2", ex);
-                            }
-                        } catch(final  RuntimeException ex) {
-                            throw new CustomTestException("ex3", ex);
-                        }
-                    }
-                }
-
-                class THROW_EXCEPTION_IN_USER_CODE_WITHIN_REFLECTION {
-                        private static void wrap_custom_test_class() throws ClassNotFoundException, 
-                                                    NoSuchMethodException,
-                                                    InstantiationException, IllegalAccessException,
-                                                    InvocationTargetException {
-                            Class a = Class.forName("com.exasol.CustomTestClass");
-                            Constructor<?> constructor = a.getConstructor();
-                            Object obj = constructor.newInstance();
-                            Method m = a.getMethod("throwEx");
-                            m.invoke(obj);
-                        }
-
-                    public static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        wrap_custom_test_class();
-                    }
-                }
-                '''))
-        try:
-            self.query("SELECT T1.throw_exception_in_user_code_within_reflection() FROM DUAL")
-        except DataError as ex:
-            exception = ex
-
-        self._verify_exception(exception,
-                               expected_list=["VM error",
-                                              "com.exasol.ExaUDFException: ",
-                                              "com.exasol.CustomTestException: ex3",
-                                              "com.exasol.CustomTestClass.throwEx(THROW_EXCEPTION_IN_USER_CODE_WITHIN_REFLECTION.java:23)",
-                                              "java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)",
-                                              "java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke",
-                                              "java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke",
-                                              "java.base/java.lang.reflect.Method.invoke",
-                                              "com.exasol.THROW_EXCEPTION_IN_USER_CODE_WITHIN_REFLECTION.wrap_custom_test_class",
-                                              "com.exasol.THROW_EXCEPTION_IN_USER_CODE_WITHIN_REFLECTION.run",
-                                              "com.exasol.ExaWrapper.run"],
-                               not_expected_strings=["InvocationTargetException",
-                                                     "MalformedParameterizedTypeException",
-                                                     "UndeclaredThrowableException"])
-
-    def _verify_exception(self, exception, expected_list, not_expected_strings):
-        exception_str = str(exception)
-        exception_str_lines = exception_str.split(sep="\\n")
-        for idx in range(len(expected_list)):
-            if expected_list[idx] not in exception_str_lines[idx]:
-                self.fail(f'"{expected_list[idx]}" not in "{exception_str_lines[idx]}"')
-        for not_expected_string in not_expected_strings:
-            if not_expected_string in exception_str:
-                self.fail(f'"{not_expected_string}" in "{exception_str}"')
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/java/external_jar_files.py b/test_container/tests/test/java/external_jar_files.py
deleted file mode 100644
index 76f27c5..0000000
--- a/test_container/tests/test/java/external_jar_files.py
+++ /dev/null
@@ -1,83 +0,0 @@
-import os
-import shutil
-import subprocess
-import tempfile
-from pathlib import Path
-import tarfile
-
-import requests
-from exasol_python_test_framework import udf
-from exasol_python_test_framework import docker_db_environment
-from exasol_python_test_framework.udf import useData, expectedFailure
-from exasol_python_test_framework.udf.udf_debug import UdfDebugger
-from exasol_python_test_framework.exatest.utils import obj_from_json_file
-from requests.auth import HTTPBasicAuth
-
-script_dir = Path(os.path.dirname(os.path.realpath(__file__)))
-java_udf_dir = script_dir / "resources/java_udf"
-
-@udf.skipIfNot(docker_db_environment.is_available, reason="This test requires a docker-db environment")
-class JavaExtJarFileReferences(udf.TestCase):
-    """
-    Test for the Script Options Parser v2 which validates that correct processing of the (%jar) option.
-    """
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.java_udf_jar_java = self.build_java_udf()
-
-    def setUp(self):
-        self.query('CREATE SCHEMA JAVA_MODULES', ignore_errors=True)
-        self.query('OPEN SCHEMA JAVA_MODULES')
-        self.env = docker_db_environment.DockerDBEnvironment("JAVA_MODULE_TEST")
-        self.jar_target = self.build_java_udf()
-
-    def build_java_udf(self) -> Path:
-        result = subprocess.run(["mvn", "--batch-mode", "--file", java_udf_dir / "pom.xml", "clean", "package",
-                                 f"-Djava.version=11"], stdout=subprocess.PIPE)
-        result.check_returncode()
-        jar = java_udf_dir / f"target/test-udf-java-11.jar"
-        assert jar.exists()
-        target = Path(tempfile.gettempdir()) / f"test-udf-java-11.jar"
-        shutil.move(jar, target)
-        return target
-
-    def upload_to_bucketfs(self, src_path: Path, expected_jar_in_script_option: str, target_filename: str) -> str:
-        env_info = obj_from_json_file("/environment_info.json")
-        docker_db_ip = env_info.database_info.container_info.ip_address
-        bucketfs_port = env_info.database_info.ports._bucketfs_http
-        with tempfile.TemporaryDirectory() as tmp_dir:
-            local_target_file_path = Path(tmp_dir) / target_filename
-            shutil.copy(src_path, local_target_file_path)
-            target_targz_filename = Path(tmp_dir) / "java_jar_ref_test.tar.gz"
-            with tarfile.open(target_targz_filename, "w:gz") as tar:
-                tar.add(local_target_file_path, arcname=target_filename)
-            upload_url = f"http://{docker_db_ip}:{bucketfs_port}/myudfs/jar_references_test/java_jar_ref_test.tar.gz"
-            username = "w"
-            password = "write"
-            print(f"Trying to upload to {upload_url}")
-            r_upload = requests.put(upload_url, data=target_targz_filename.read_bytes(), auth=HTTPBasicAuth(username, password))
-            r_upload.raise_for_status()
-        return f"/buckets/bfsdefault/myudfs/jar_references_test/java_jar_ref_test/{expected_jar_in_script_option}"
-
-    @useData([("java_jar.jar", "java_jar.jar"), ("java_jar.jar\ ", "java_jar.jar "),
-              (r"java_jar.jar\  ", r"java_jar.jar "), ("java_jar.jar\\t", "java_jar.jar\t"),
-              ("java_jar.jar ", "java_jar.jar")])
-    def test_jar_references(self, expected_jar_in_script_option, uploaded_jar):
-        """
-        Install the jar file with the specific file name in BucketFS, and then create the UDF
-        which uses this JAR file name. The JAR filename in the UDF (%jar) needs to be properly encoded.
-        """
-        bucketfs_path = self.upload_to_bucketfs(self.jar_target, expected_jar_in_script_option, uploaded_jar)
-        self.query(udf.fixindent(f'''
-            CREATE OR REPLACE JAVA SCALAR SCRIPT JAVA_TEST_JAR_UDF() RETURNS INT AS
-            %scriptclass com.exasol.slc.testudf.Main;
-            %env SCRIPT_OPTIONS_PARSER_VERSION=2;
-            %jar {bucketfs_path};
-            '''))
-        rows = self.query(f"SELECT JAVA_TEST_JAR_UDF()")
-        self.assertGreaterEqual(rows[0][0], 11)
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/java/general.py b/test_container/tests/test/java/general.py
deleted file mode 100755
index e88e52b..0000000
--- a/test_container/tests/test/java/general.py
+++ /dev/null
@@ -1,863 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-from exasol_python_test_framework.exatest import useData
-
-
-class JavaInterpreter(udf.TestCase):
-    def setUp(self):
-        self.query('CREATE SCHEMA FN2', ignore_errors=True)
-        self.query('OPEN SCHEMA FN2')
-
-    def test_main_is_not_executed_at_creation_time(self):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                main_error()
-                RETURNS int AS
-                class MAIN_ERROR {
-                    static void main(String[] args) {
-                        throw new RuntimeException("Main Executed");
-                    }
-
-                    static int run(ExaMetadata exa, ExaIterator ctx) {
-                        ctx.emit(42);
-                    }
-                }
-                /
-                '''))
-
-    def test_syntax_errors_not_caught_at_creation_time(self):
-        sql = udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                syntax_error()
-                RETURNS int AS
-                class SYNTAX_ERROR {
-                    static int run(ExaMetadata exa, ExaIterator ctx) {
-                        return 42
-                    }
-                }
-                /
-                ''')
-        self.query(sql)
-
-    def test_methods_have_access_to_class_members(self):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                other_mem()
-                RETURNS int AS
-                class OTHER_MEM {
-                    static int foo = 2;
-                    static int other() {
-                        foo = 5;
-                        return foo;
-                    }
-                    static int run(ExaMetadata exa, ExaIterator ctx) {
-                        return other();
-                    }
-                }
-                '''))
-        row = self.query('SELECT other_mem() FROM DUAL')[0]
-        self.assertEqual(5, row[0])
-
-    def test_exception_in_init_is_propagated(self):
-        self.query(udf.fixindent('''
-            CREATE OR REPLACE java SCALAR SCRIPT
-            foo()
-            RETURNS INT AS
-            class FOO {
-                static int run(ExaMetadata exa, ExaIterator ctx) {
-                    return 42;
-                }
-                static int init(ExaMetadata exa) throws Exception {
-                    throw new Exception("4711");
-                }
-            }
-            '''))
-        with self.assertRaisesRegex(Exception, '4711'):
-            self.query('SELECT foo() FROM dual')
-
-    def test_init_has_global_context(self):
-        self.query(udf.fixindent('''
-            CREATE OR REPLACE java SCALAR SCRIPT
-            foo()
-            RETURNS INT AS
-            class FOO {
-                static int flag = 21;
-                static int run(ExaMetadata exa, ExaIterator ctx) {
-                    flag = 4711;
-                    return 42;
-                }
-                static int init(ExaMetadata exa) throws Exception {
-                    throw new Exception(Integer.toString(flag));
-                }
-            }
-            '''))
-        with self.assertRaisesRegex(Exception, '21'):
-            self.query('SELECT foo() FROM dual')
-
-    def test_exception_in_cleanup_is_propagated(self):
-        self.query(udf.fixindent('''
-            CREATE OR REPLACE java SCALAR SCRIPT
-            foo()
-            RETURNS INT AS
-            class FOO {
-                static int run(ExaMetadata exa, ExaIterator ctx) {
-                    return 42;
-                }
-                static int cleanup(ExaMetadata exa) throws Exception {
-                    throw new Exception("4711");
-                }
-            }
-            '''))
-        with self.assertRaisesRegex(Exception, '4711'):
-            self.query('SELECT foo() FROM dual')
-
-    def test_exception_in_run_and_cleanup_is_propagated(self):
-        out, _err = self.query_via_exaplus(udf.fixindent('''
-            DROP SCHEMA test_exception_in_run_and_cleanup_is_propagated CASCADE;
-            CREATE SCHEMA test_exception_in_run_and_cleanup_is_propagated;
-            OPEN SCHEMA test_exception_in_run_and_cleanup_is_propagated;
-            CREATE OR REPLACE java SCALAR SCRIPT
-            foo()
-            RETURNS INT AS
-            class FOO {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    throw new Exception("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
-                }
-                static int cleanup(ExaMetadata exa) throws Exception {
-                    throw new Exception("YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY");
-                }
-            }
-            /
-            SELECT foo() FROM dual;
-            DROP SCHEMA test_exception_in_run_and_cleanup_is_propagated CASCADE;
-            ROLLBACK;
-            '''))
-        print(out)
-        print()
-        print()
-        print(_err)
-        _err = _err.decode("utf-8")
-        self.assertRegexpMatches(_err.replace("\n"," "), "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.*YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY")
-
-    def test_cleanup_has_global_context(self):
-        self.query(udf.fixindent('''
-            CREATE OR REPLACE java SCALAR SCRIPT
-            foo()
-            RETURNS INT AS
-            class FOO {
-                static int flag = 21;
-                static int run(ExaMetadata exa, ExaIterator ctx) {
-                    flag = 4711;
-                    return 42;
-                }
-                static int cleanup(ExaMetadata exa) throws Exception {
-                    throw new Exception(Integer.toString(flag));
-                }
-            }
-            '''))
-        with self.assertRaisesRegex(Exception, '4711'):
-            rows = self.query('SELECT foo() FROM dual')
-            self.assertRowsEqual([(42,)], rows)
-
-
-class JavaJar(udf.TestCase):
-
-    legacy_env_declaration = ""
-    ctpg_parser_env_declaration = "%env SCRIPT_OPTIONS_PARSER_VERSION=2;"
-    additional_env_declarations = [(legacy_env_declaration,), (ctpg_parser_env_declaration,)]
-
-    def setUp(self):
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-
-    @useData(((legacy_env_declaration, 'No values found for %jar statement'),
-              (ctpg_parser_env_declaration,
-               "Error parsing script options at line 1: \[1:5\] PARSE: Syntax error: Unexpected \'<eof>\'")))
-    def test_jar_path(self, additional_env_declaration, expected_error):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jar_path()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jar
-                '''))
-        with self.assertRaisesRegex(Exception, expected_error):
-            rows = self.query('SELECT test_jar_path() FROM dual')
-
-    @useData(((legacy_env_declaration, 'End of %jar statement not found'),
-              (ctpg_parser_env_declaration,
-               "Error parsing script options at line 1: \[1:5\] PARSE: Syntax error: Unexpected \'<eof>\'")))
-    def test_jar_path2(self, additional_env_declaration, expected_error):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jar_path2()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jar
-                class TEST_JAR_PATH2 {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        X.run(exa, ctx);
-                        return 42;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, expected_error):
-            rows = self.query('SELECT test_jar_path2() FROM dual')
-
-    @useData(((legacy_env_declaration, 'No values found for %jar statement'),
-              (ctpg_parser_env_declaration,
-               "Error parsing script options at line 1: \[1:6\] PARSE: Syntax error: Unexpected \';\'")))
-    def test_jar_path3(self, additional_env_declaration, expected_error):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jar_path3()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jar ;
-                class TEST_JAR_PATH3 {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        X.run(exa, ctx);
-                        return 42;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, expected_error):
-            rows = self.query('SELECT test_jar_path3() FROM dual')
-
-    @useData(((legacy_env_declaration, 'End of %jar statement not found'),
-              (ctpg_parser_env_declaration,
-               "Error parsing script options at line 1: \[1:20\] PARSE: Syntax error: Unexpected \'<eof>\'")))
-    def test_jar_path_end(self, additional_env_declaration, expected_error):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jar_path_end()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jar /my/path/x.jar'''))
-        with self.assertRaisesRegex(Exception, expected_error):
-            rows = self.query('SELECT test_jar_path_end() FROM dual')
-
-    @useData(additional_env_declarations)
-    def test_jar_tab(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                jar_case_tab()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jar		/my/path/x.jar;
-                class JAR_CASE_TAB {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'No such file or directory'):
-            rows = self.query('SELECT jar_case_tab() FROM DUAL')
-
-    @useData(additional_env_declarations)
-    def test_jar_tab_end(self, additional_env_declaration):
-        """
-        Note that both parser throw errors for different reasons:
-        1. The legacy parser will convert '/my/path/x.jar 		 ' to '/my/path/x.jar'
-        2. The ctpg based parser will keep the trailing white spaces.
-        """
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                jar_case_tab_end()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jar		/my/path/x.jar 		 ;
-                class JAR_CASE_TAB_END {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'No such file or directory'):
-            rows = self.query('SELECT jar_case_tab_end() FROM DUAL')
-
-    @useData(additional_env_declarations)
-    def test_jar_multiple_statements(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                jar_case_multi_statements()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jar /my/path/x.jar;
-                %jar /my/path/x2.jar;
-                class JAR_CASE_MULTI_STATEMENTS {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'No such file or directory'):
-            rows = self.query('SELECT jar_case_multi_statements() FROM DUAL')
-
-    @useData(additional_env_declarations)
-    def test_jar_commented(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                jar_case_commented()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                // %jar /my/path/x.jar;
-                class JAR_CASE_COMMENTED {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        rows = self.query('SELECT jar_case_commented() FROM DUAL')
-        self.assertEqual(1, rows[0][0])
-
-    @useData(additional_env_declarations)
-    def test_jar_commented_after_code(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                jar_case_commented_after_code()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                class JAR_CASE_COMMENTED_AFTER_CODE {  // %jar /my/path/x.jar;
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        rows = self.query('SELECT jar_case_commented_after_code() FROM DUAL')
-        self.assertEqual(1, rows[0][0])
-
-    @useData(additional_env_declarations)
-    def test_jar_after_code(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                jar_case_after_code()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                class JAR_CASE_AFTER_CODE { %jar /my/path/x.jar;
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'VM error:'):
-            rows = self.query('SELECT jar_case_after_code() FROM DUAL')
-
-    @useData(additional_env_declarations)
-    def test_jar_multiple_jars(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                jar_case_multi_jars()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jar /my/path/x.jar:/my/path/x2.jar;
-                class JAR_CASE_MULTI_JARS {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'No such file or directory'):
-            rows = self.query('SELECT jar_case_multi_jars() FROM DUAL')
-
-
-class JavaSyntax(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-
-    def test_sql_comments_are_not_ignored(self):
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            sql_comments()
-            RETURNS INT AS
-            class SQL_COMMENTS {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return (
-                        --3
-                        +4);
-                }
-            }
-            '''))
-        with self.assertRaisesRegex(Exception, 'ExaCompilationException'):
-            rows = self.query('SELECT sql_comments() FROM dual')
-
-    def test_java_comments_are_ignored_in_functions(self):
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            java_comments()
-            RETURNS INT AS
-            class JAVA_COMMENTS {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return (
-                        //3
-                        /*
-                        +6
-                        */
-                        +4);
-                }
-            }
-            '''))
-        rows = self.query('SELECT java_comments() FROM dual')
-        self.assertEqual(4, rows[0][0])
-
-    def test_java_comments_are_ignored_in_body(self):
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            java_comments()
-            RETURNS INT AS
-            class JAVA_COMMENTS {
-                // InT x <- 21;
-                /* InT x <- 21; */
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return 43;
-                }
-            }
-            '''))
-        rows = self.query('SELECT java_comments() FROM dual')
-        self.assertEqual(43, rows[0][0])
-
-
-class JavaJvmOption(udf.TestCase):
-
-    legacy_env_declaration = ""
-    ctpg_parser_env_declaration = "%env SCRIPT_OPTIONS_PARSER_VERSION=2;"
-    additional_env_declarations = [(legacy_env_declaration,), (ctpg_parser_env_declaration,)]
-
-    def setUp(self):
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-
-    @useData(((legacy_env_declaration, 'No values found for %jvmoption statement'),
-              (ctpg_parser_env_declaration,
-               "Error parsing script options at line 1: \[1:11\] PARSE: Syntax error: Unexpected \'<eof>\'")))
-    def test_jvm_opt(self, additional_env_declaration, expected_error):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jvmoption
-                '''))
-        with self.assertRaisesRegex(Exception, expected_error):
-            rows = self.query('SELECT test_jvm_opt() FROM dual')
-
-    @useData(((legacy_env_declaration, 'End of %jvmoption statement not found'),
-              (ctpg_parser_env_declaration,
-               "Error parsing script options at line 1: \[1:11\] PARSE: Syntax error: Unexpected \'<eof>\'")))
-    def test_jvm_opt2(self, additional_env_declaration, expected_error):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt2()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jvmoption
-                class TEST_JVM_OPT2 {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        X.run(exa, ctx);
-                        return 42;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, expected_error):
-            rows = self.query('SELECT test_jvm_opt2() FROM dual')
-
-    @useData(((legacy_env_declaration, 'No values found for %jvmoption statement'),
-              (ctpg_parser_env_declaration,
-               "Error parsing script options at line 1: \[1:12\] PARSE: Syntax error: Unexpected \';\'")))
-    def test_jvm_opt3(self, additional_env_declaration, expected_error):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt3()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jvmoption ;
-                class TEST_JVM_OPT3 {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        X.run(exa, ctx);
-                        return 42;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, expected_error):
-            rows = self.query('SELECT test_jvm_opt3() FROM dual')
-
-    @useData(((legacy_env_declaration, 'End of %jvmoption statement not found'),
-              (ctpg_parser_env_declaration,
-               "Error parsing script options at line 1: \[1:20\] PARSE: Syntax error: Unexpected \'<eof>\'")))
-    def test_jvm_opt4(self, additional_env_declaration, expected_error):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt4()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jvmoption -Xmx512m'''))
-        with self.assertRaisesRegex(Exception, expected_error):
-            rows = self.query('SELECT test_jvm_opt4() FROM dual')
-
-    @useData(additional_env_declarations)
-    def test_jvm_opt_tab(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt_tab()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jvmoption		-Xmx512m;
-                class TEST_JVM_OPT_TAB {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        rows = self.query('SELECT test_jvm_opt_tab() FROM DUAL')
-        self.assertEqual(1, rows[0][0])
-
-    @useData(additional_env_declarations)
-    def test_jvm_opt_tab_end(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt_tab_end()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jvmoption		-Xmx512m 		 ;
-                class TEST_JVM_OPT_TAB_END {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        rows = self.query('SELECT test_jvm_opt_tab_end() FROM DUAL')
-        self.assertEqual(1, rows[0][0])
-
-    @useData(additional_env_declarations)
-    def test_jvm_opt_multiple_opts(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt_multiple_opts()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jvmoption -Xms56m -Xmx128m -Xss512k;
-                class TEST_JVM_OPT_MULTIPLE_OPTS {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        rows = self.query('SELECT test_jvm_opt_multiple_opts() FROM DUAL')
-        self.assertEqual(1, rows[0][0])
-
-    @useData(additional_env_declarations)
-    def test_jvm_opt_multiple_opts2(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt_multiple_opts2()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jvmoption -Xmx5000m;
-                %jvmoption -Xms56m -Xmx128m -Xss1k;
-                %jvmoption -Xss512k -Xms128m;
-                class TEST_JVM_OPT_MULTIPLE_OPTS2 {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        rows = self.query('SELECT test_jvm_opt_multiple_opts2() FROM DUAL')
-        self.assertEqual(1, rows[0][0])
-
-    @useData(additional_env_declarations)
-    def test_jvm_opt_invalid_opt(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt_invalid_opt()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jvmoption -Xmj56m;
-                class TEST_JVM_OPT_INVALID_OPT {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, '.*Cannot start the JVM: unknown error.*'):
-            rows = self.query('SELECT test_jvm_opt_invalid_opt() FROM dual')
-
-    @useData(additional_env_declarations)
-    def test_jvm_opt_invalid_opt2(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt_invalid_opt2()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jvmoption -Xmx56m junk;
-                class TEST_JVM_OPT_INVALID_OPT2 {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, '.*Cannot start the JVM: unknown error.*'):
-            rows = self.query('SELECT test_jvm_opt_invalid_opt2() FROM dual')
-
-    @useData(additional_env_declarations)
-    def test_jvm_opt_invalid_opt3(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt_invalid_opt3()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jvmoption -Xjunk;
-                %jvmoption -Xmx56m;
-                class TEST_JVM_OPT_INVALID_OPT3 {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, '.*Cannot start the JVM: unknown error.*'):
-            rows = self.query('SELECT test_jvm_opt_invalid_opt3() FROM dual')
-
-    @useData(additional_env_declarations)
-    def test_jvm_opt_invalid_opt4(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt_invalid_opt4()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jvmoption -Xms56q;
-                class TEST_JVM_OPT_INVALID_OPT4 {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'invalid arguments'):
-            rows = self.query('SELECT test_jvm_opt_invalid_opt4() FROM dual')
-
-    @useData(additional_env_declarations)
-    def test_jvm_opt_invalid_mem(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt_invalid_mem()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jvmoption -Xmx900000000m;
-                class TEST_JVM_OPT_INVALID_MEM {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'VM crashed'):
-            rows = self.query('SELECT test_jvm_opt_invalid_mem() FROM dual')
-
-    @useData(additional_env_declarations)
-    def test_jvm_opt_invalid_mem2(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt_invalid_mem2()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jvmoption -Xms1m -Xmx1m;
-                class TEST_JVM_OPT_INVALID_MEM2 {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'VM error:'):
-            rows = self.query('SELECT test_jvm_opt_invalid_mem2() FROM dual')
-
-    @useData(additional_env_declarations)
-    def test_jvm_opt_invalid_stack_size(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt_invalid_stack_size()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %jvmoption -Xss1k;
-                class TEST_JVM_OPT_INVALID_STACK_SIZE {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'unknown error'):
-            rows = self.query('SELECT test_jvm_opt_invalid_stack_size() FROM dual')
-
-    @useData([("-Dmyoption=Hello\ World", "Hello World"), ("-Dmyoption=\"Hello\ World\"", "\"Hello World\""),
-              ("-Dmyoption=Hello\\tWorld", "Hello\tWorld"), ("-Dmyoption=Hello\\vWorld", "Hello\vWorld"),
-              ("-Dmyoption=Hello\\\\World", "Hello\\World"), ("-Dmyoption=Hello\\fWorld", "Hello\fWorld"),
-              ("-Dmyoption=Hello\ World\\t\\t   ", "Hello World\t\t")])
-    def test_jvm_opt_escape_sequence(self, jvm_option_value, expected_return_value):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                test_jvm_opt_with_escape()
-                RETURNS VARCHAR(10000) AS
-                %env SCRIPT_OPTIONS_PARSER_VERSION=2;
-                %jvmoption ''' + jvm_option_value + ''';
-                class TEST_JVM_OPT_WITH_ESCAPE {
-                    static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return System.getProperty("myoption");
-                    }
-                }
-                '''))
-        self.assertRowsEqual([(expected_return_value,)],
-                             self.query('''SELECT test_jvm_opt_with_escape()'''))
-
-
-class JavaScriptClass(udf.TestCase):
-
-    additional_env_declarations = [("",), ("%env SCRIPT_OPTIONS_PARSER_VERSION=2;",)]
-
-    def setUp(self):
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-
-    @useData(additional_env_declarations)
-    def test_set_script_class(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT A()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %scriptclass com.exasol.B;
-                class B {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        self.assertRowsEqual([(1,)],
-            self.query('''SELECT a()'''))
-
-
-    @useData(additional_env_declarations)
-    def test_set_script_class_2(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT A()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %scriptclass   com.exasol.B   ;
-                class B {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        self.assertRowsEqual([(1,)],
-            self.query('''SELECT a()'''))
-
-    @useData(additional_env_declarations)
-    def test_set_invalid_script_class(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT A()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %scriptclass com.exasol.C;
-                class B {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'The main script class .* cannot be found:'):
-            self.query('''SELECT a()''')
-
-    @useData(additional_env_declarations)
-    def test_set_invalid_script_class_2(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT A()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                // Looks correct, however the script B is in the com.exasol package implicitly.
-                %scriptclass B;
-                class B {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'The main script class .* cannot be found:'):
-            self.query('''SELECT a()''')
-
-    @useData(additional_env_declarations)
-    def test_invalid_script_class(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT A()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                class B {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'The main script class .* cannot be found:'):
-            self.query('''SELECT a()''')
-
-
-class JavaGenericEmit(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-
-    def test_emit_object_array_multi_arg(self):
-        self.query(udf.fixindent('''
-                CREATE JAVA SET SCRIPT EMIT_OBJECT (a int) EMITS (a varchar(100), b int) AS
-                class EMIT_OBJECT {
-                  static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    Object[] ret = new Object[2];
-                    ret[0] = "object-array-emit";
-                    ret[1] = 12345;
-                    ctx.emit(ret);
-                  }
-                }
-                '''))
-        rows = self.query('''
-            select a || 'X' || B from (
-            select EMIT_OBJECT(1));
-            ''')
-        self.assertRowEqual(('object-array-emitX12345',), rows[0])
-
-    def test_emit_object_array_single_arg(self):
-        self.query(udf.fixindent('''
-                CREATE JAVA SET SCRIPT EMIT_OBJECT_AND_REGULAR (a int) EMITS (a varchar(100)) AS
-                class EMIT_OBJECT_AND_REGULAR {
-                  static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    Object[] ret = new Object[1];
-                    ret[0] = "object-array-emit";
-                    ctx.emit(ret);
-                    ctx.emit("regular-emit");
-                  }
-                }
-                '''))
-        rows = self.query('''
-            SELECT EMIT_OBJECT_AND_REGULAR(1);
-            ''')
-        self.assertRowEqual(('object-array-emit',), rows[0])
-        self.assertRowEqual(('regular-emit',), rows[1])
-
-    def test_emit_object_array_varemit(self):
-        self.query(udf.fixindent('''
-                CREATE JAVA SET SCRIPT VAREMIT_GENERIC_EMIT (a varchar(100)) EMITS (...) AS
-                class VAREMIT_GENERIC_EMIT {
-                  static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    int cols = (int)exa.getOutputColumnCount();
-                    Object[] ret = new Object[cols];
-                    for (int i=0; i<cols; i++) {
-                      ret[i] = ctx.getString(0);
-                    }
-                    ctx.emit(ret);
-                  }
-                }
-                '''))
-        rows = self.query('''
-            SELECT "A" || 'x' || "B" FROM (
-            SELECT VAREMIT_GENERIC_EMIT('SUPERDYNAMIC') EMITS (a varchar(100), b varchar(100)));
-            ''')
-        self.assertRowEqual(('SUPERDYNAMICxSUPERDYNAMIC',), rows[0])
-
-if __name__ == '__main__':
-    udf.main()
-
diff --git a/test_container/tests/test/java/java_modules.py b/test_container/tests/test/java/java_modules.py
deleted file mode 100644
index 2c878f3..0000000
--- a/test_container/tests/test/java/java_modules.py
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-from pathlib import Path
-import shutil
-import subprocess
-import tempfile
-import zipfile
-import requests
-from requests.auth import HTTPBasicAuth
-
-from exasol_python_test_framework import udf
-from exasol_python_test_framework import docker_db_environment
-from exasol_python_test_framework.udf import useData, expectedFailure
-from exasol_python_test_framework.udf.udf_debug import UdfDebugger
-from exasol_python_test_framework.exatest.utils import obj_from_json_file
-
-
-script_dir = Path(os.path.dirname(os.path.realpath(__file__)))
-java_udf_dir = script_dir / "resources/java_udf"
-
-@udf.skipIfNot(docker_db_environment.is_available, reason="This test requires a docker-db environment")
-class JavaModules(udf.TestCase):
-    env = None
-    java_udf_jar_java11 = None
-    java_udf_jar_java17 = None
-
-    additional_env_declarations = [("",), ("%env SCRIPT_OPTIONS_PARSER_VERSION=2;",)]
-    
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.java_udf_jar_java11 = self.build_java_udf(11)
-        self.java_udf_jar_java17 = self.build_java_udf(17)
-
-    def setUp(self):
-        self.query('CREATE SCHEMA JAVA_MODULES', ignore_errors=True)
-        self.query('OPEN SCHEMA JAVA_MODULES')
-        self.env = docker_db_environment.DockerDBEnvironment("JAVA_MODULE_TEST")
-
-    def build_java_udf(self, javaVersion: int) -> Path:
-        result = subprocess.run(["mvn", "--batch-mode", "--file", java_udf_dir/"pom.xml", "clean", "package", f"-Djava.version={javaVersion}"], stdout=subprocess.PIPE)
-        result.check_returncode()
-        jar = java_udf_dir / f"target/test-udf-java-{javaVersion}.jar"
-        assert jar.exists()
-        target = Path(tempfile.gettempdir()) / f"test-udf-java-{javaVersion}.jar"
-        shutil.move(jar, target)
-        return target
-
-    def test_udf_jar_is_module(self):
-        with zipfile.ZipFile(self.java_udf_jar_java11, 'r') as zip:
-            assert "module-info.class" in zip.namelist()
-    
-    def test_udf_jar_is_module_java17(self):
-        with zipfile.ZipFile(self.java_udf_jar_java17, 'r') as zip:
-            assert "module-info.class" in zip.namelist()
-
-
-    def upload_to_bucketfs(self, path: Path) -> str:
-        env_info = obj_from_json_file("/environment_info.json")
-        docker_db_ip = env_info.database_info.container_info.ip_address
-        bucketfs_port = env_info.database_info.ports._bucketfs_http
-        upload_url = f"http://{docker_db_ip}:{bucketfs_port}/myudfs/{path.name}"
-        username = "w"
-        password = "write"
-        print(f"Trying to upload to {upload_url}")
-        r_upload = requests.put(upload_url, data=path.read_bytes(), auth=HTTPBasicAuth(username, password))
-        r_upload.raise_for_status()
-        return f"/buckets/bfsdefault/myudfs/{path.name}"
-
-    @useData(additional_env_declarations)
-    def test_java_11_udf(self, additional_env_declaration):
-        """
-        Verify that a module JAR built for Java 11 with a module-info.class can be used in a UDF.
-        We don't know the JRE version installed in the SLC, so we accept both 11 and 17.
-        """
-        assert self.get_jre_version(additional_env_declaration) in ["11", "17"]
-
-    @useData(additional_env_declarations)
-    def test_java_17_udf(self, additional_env_declaration):
-        """
-        Verify that a module JAR built for Java 17 can be used in a UDF.
-        We don't know the JRE version installed in the SLC, so first check that it is 11 or 17.
-        Exepct an error if the JRE version is not 17.
-        """
-        bucketfs_path = self.upload_to_bucketfs(self.java_udf_jar_java17)
-        self.query(udf.fixindent(f'''
-            CREATE JAVA SCALAR SCRIPT JAVA_17_UDF() RETURNS INT AS
-            {additional_env_declaration}
-            %scriptclass com.exasol.slc.testudf.Main;
-            %jar {bucketfs_path};
-            '''))
-        if self.get_jre_version(additional_env_declaration) == "17":
-            rows = self.query("SELECT JAVA_17_UDF()")
-            return str(rows[0][0])
-        else:
-            with self.assertRaisesRegex(Exception, "UnsupportedClassVersionError: com/exasol/slc/testudf/Main has been compiled by a more recent version of the Java Runtime"):
-                self.query("SELECT JAVA_17_UDF()")
-
-    def get_jre_version(self, additional_env_declaration) -> str:
-        """
-        Get the SLC's JRE version by executing a Java 11 UDF that returns the JRE major version ("11" or "17").
-        """
-        bucketfs_path = self.upload_to_bucketfs(self.java_udf_jar_java11)
-        self.query(udf.fixindent(f'''
-                CREATE JAVA SCALAR SCRIPT JRE_VERSION() RETURNS INT AS
-                {additional_env_declaration}
-                %scriptclass com.exasol.slc.testudf.Main;
-                %jar {bucketfs_path};
-                '''))
-        rows = self.query("SELECT JRE_VERSION()")
-        return str(rows[0][0])
- 
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/java/jvm_owned_native_libs.py b/test_container/tests/test/java/jvm_owned_native_libs.py
deleted file mode 100644
index 3bba17b..0000000
--- a/test_container/tests/test/java/jvm_owned_native_libs.py
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-
-from exasol_python_test_framework import udf
-from exasol_python_test_framework.udf import useData, expectedFailure
-
-class JVMOwnedNativeLibsTest(udf.TestCase):
-
-    def setUp(self):
-        self.query('CREATE SCHEMA JAVA_NATIVE', ignore_errors=True)
-        self.query('OPEN SCHEMA JAVA_NATIVE')
-
-    def test_libmanagement(self):
-        self.query(udf.fixindent('''
-                CREATE JAVA SET SCRIPT JAVA_LIBMANAGEMENT (a varchar(100)) EMITS (b varchar(10000)) AS
-                import java.lang.management.ManagementFactory;
-
-                class JAVA_LIBMANAGEMENT {
-                  static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    final String jvmName = ManagementFactory.getRuntimeMXBean().getName();
-                    ctx.emit(jvmName);
-                  }
-                }
-                '''))
-        rows = self.query('''
-            SELECT JAVA_LIBMANAGEMENT('');
-            ''')
-        self.assertGreater(len(rows[0][0]), 0)
-
-    def test_libnet(self):
-        self.query(udf.fixindent('''
-                CREATE JAVA SET SCRIPT JAVA_LIBNET (a varchar(100)) EMITS (b varchar(10000)) AS
-                import java.net.NetworkInterface;
-
-                class JAVA_LIBNET {
-                  static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    final String networkInterface = NetworkInterface.getNetworkInterfaces().nextElement().getName();
-                    ctx.emit(networkInterface);
-                  }
-                }
-                '''))
-        rows = self.query('''
-            SELECT JAVA_LIBNET('');
-            ''')
-        self.assertGreater(len(rows[0][0]), 0)
-
-    def test_libzip(self):
-        self.query(udf.fixindent('''
-                CREATE JAVA SET SCRIPT JAVA_LIBZIP (a varchar(100)) EMITS (b varchar(10000)) AS
-                import java.io.File;
-                import java.io.FileInputStream;
-                import java.io.FileOutputStream;
-                import java.io.IOException;
-                import java.util.zip.ZipEntry;
-                import java.util.zip.ZipOutputStream;
-
-                class JAVA_LIBZIP {
-                  static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    String sourceFile = "/etc/hosts";
-                    FileOutputStream fos = new FileOutputStream("/tmp/compressed.zip");
-                    ZipOutputStream zipOut = new ZipOutputStream(fos);
-                    File fileToZip = new File(sourceFile);
-                    FileInputStream fis = new FileInputStream(fileToZip);
-                    ZipEntry zipEntry = new ZipEntry(fileToZip.getName());
-                    zipOut.putNextEntry(zipEntry);
-                    byte[] bytes = new byte[1024];
-                    int length;
-                    while((length = fis.read(bytes)) >= 0) {
-                        zipOut.write(bytes, 0, length);
-                    }
-                    zipOut.close();
-                    fis.close();
-                    fos.close();
-                    ctx.emit("SUCCESS");
-                  }
-                }
-                '''))
-        rows = self.query('''
-            SELECT JAVA_LIBZIP('');
-            ''')
-        self.assertEqual(rows[0][0], "SUCCESS")
-
-    def test_libnio(self):
-        self.query(udf.fixindent('''
-                CREATE JAVA SET SCRIPT JAVA_LIBNIO (a varchar(100)) EMITS (b varchar(10000)) AS
-                import java.io.FileInputStream;
-                import java.io.FileOutputStream;
-                import java.nio.ByteBuffer;
-                import java.nio.channels.FileChannel;
-                import java.nio.charset.StandardCharsets;
-
-
-                class JAVA_LIBNIO {
-                  static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    FileInputStream fin= new FileInputStream("/etc/hosts");
-                    FileChannel channel = fin.getChannel();
-                    ByteBuffer buff = ByteBuffer.allocate(1024);
-                    int noOfBytesRead = channel.read(buff);
-                    String fileContent = new String(buff.array(), StandardCharsets.UTF_8);
-                    channel.close();
-                    fin.close();
-                    ctx.emit("SUCCESS");
-                  }
-                }
-                '''))
-        rows = self.query('''
-            SELECT JAVA_LIBNIO('');
-            ''')
-        self.assertEqual(rows[0][0], "SUCCESS")
-
-
-if __name__ == '__main__':
-    udf.main()
-
diff --git a/test_container/tests/test/java/network.py b/test_container/tests/test/java/network.py
deleted file mode 100755
index 24ec565..0000000
--- a/test_container/tests/test/java/network.py
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-
-class HTTPXMLProcessingTest(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA t1 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA t1')
-
-    def test_xml_processing(self):
-        self.query(udf.fixindent('''
-                create or replace java scalar script
-                process_users()
-                EMITS (firstname VARCHAR(100), lastname VARCHAR(100)) AS
-                import java.io.IOException;
-                import java.io.OutputStream;
-                import java.net.InetSocketAddress;
-                import java.util.Iterator;
-                import java.util.List;
-                import java.util.Set;
-                import java.util.concurrent.ExecutorService;
-                import java.util.concurrent.Executors;
-                import java.net.URL;
-                import java.net.URLConnection;
-                import javax.xml.parsers.DocumentBuilder;
-                import javax.xml.parsers.DocumentBuilderFactory;
-                import org.w3c.dom.Document;
-                import org.w3c.dom.NodeList;
-                import org.w3c.dom.Node;
-                import org.w3c.dom.Element;
-                import com.sun.net.httpserver.Headers;
-                import com.sun.net.httpserver.HttpExchange;
-                import com.sun.net.httpserver.HttpHandler;
-                import com.sun.net.httpserver.HttpServer;
-                class PROCESS_USERS {
-                    public static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        MyHttpServer hs = new MyHttpServer();
-                        int port = hs.start();
-                        URL url = new URL("http://localhost:" + port);
-                        URLConnection conn = url.openConnection();
-                        DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-                        Document doc = docBuilder.parse(conn.getInputStream());
-                        NodeList nodes = doc.getDocumentElement().getElementsByTagName("user");
-                        for (int i = 0; i < nodes.getLength(); i++) {
-                            if (nodes.item(i).getNodeType() != Node.ELEMENT_NODE)
-                                continue;
-                            Element elem = (Element)nodes.item(i);
-                            if (!elem.getAttribute("active").equals("1"))
-                                continue;
-                            String firstName = elem.getElementsByTagName("first_name").item(0).getChildNodes().item(0).getNodeValue();
-                            String lastName = elem.getElementsByTagName("last_name").item(0).getChildNodes().item(0).getNodeValue();
-                            ctx.emit(firstName, lastName);
-                        }
-                        hs.stop();
-                    }
-
-                    private static class MyHttpServer {
-                        HttpServer server;
-                        ExecutorService exService;
-
-                        public int start() throws IOException {
-                            server = HttpServer.create(new InetSocketAddress(0), 0);
-                            server.createContext("/", new MyHandler());
-                            exService = Executors.newCachedThreadPool();
-                            server.setExecutor(exService);
-                            server.start();
-                            return server.getAddress().getPort();
-                        }
-
-                        public void stop() throws IOException {
-                                    exService.shutdown();
-                            server.stop(0);
-                        }
-                    }
-
-                    private static class MyHandler implements HttpHandler {
-                        public void handle(HttpExchange exchange) throws IOException {
-                            StringBuilder xml = new StringBuilder();
-                            xml.append(\"<?xml version=\'1.0\' encoding=\'UTF-8\'?>\\n    <users>\\n    \");
-                            xml.append(\"<user active=\\"1\\">\\n    <first_name>Manuel</first_name>\\n    <last_name>Neuer</last_name>\\n    </user>\\n    \");
-                            xml.append(\"<user active=\\"1\\">\\n    <first_name>Joe</first_name>\\n    <last_name>Hart</last_name>\\n    </user>\\n    \");
-                            xml.append(\"<user active=\\"0\\">\\n    <first_name>Oliver</first_name>\\n    <last_name>Kahn</last_name>\\n    </user>\\n    \");
-                            xml.append(\"</users>\");
-
-                            String requestMethod = exchange.getRequestMethod();
-                            if (requestMethod.equalsIgnoreCase("GET")) {
-                                Headers responseHeaders = exchange.getResponseHeaders();
-                                responseHeaders.set("Content-Type", "text/plain");
-                                exchange.sendResponseHeaders(200, xml.length());
-                                OutputStream responseBody = exchange.getResponseBody();
-                                responseBody.write(xml.toString().getBytes());
-                                responseBody.close();
-                            }
-                        }
-                    }
-                }
-                '''))
-
-        rows = self.query('''
-                SELECT process_users()
-                FROM DUAL
-                ORDER BY lastname
-                ''')
-
-        expected = [('Joe', 'Hart'), ('Manuel', 'Neuer')]
-        self.assertRowsEqual(expected, rows)
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/java/resources/hadoop_etl_udf/hadoop-hive.env b/test_container/tests/test/java/resources/hadoop_etl_udf/hadoop-hive.env
deleted file mode 100644
index 9d9fd51..0000000
--- a/test_container/tests/test/java/resources/hadoop_etl_udf/hadoop-hive.env
+++ /dev/null
@@ -1,30 +0,0 @@
-HIVE_SITE_CONF_javax_jdo_option_ConnectionURL=jdbc:postgresql://{container_name_prefix}hive-metastore-postgresql/metastore
-HIVE_SITE_CONF_javax_jdo_option_ConnectionDriverName=org.postgresql.Driver
-HIVE_SITE_CONF_javax_jdo_option_ConnectionUserName=hive
-HIVE_SITE_CONF_javax_jdo_option_ConnectionPassword=hive
-HIVE_SITE_CONF_datanucleus_autoCreateSchema=false
-HIVE_SITE_CONF_hive_metastore_uris=thrift://{container_name_prefix}hive-metastore:9083
-HDFS_CONF_dfs_namenode_datanode_registration_ip___hostname___check=false
-
-CORE_CONF_fs_defaultFS=hdfs://{container_name_prefix}namenode:8020
-CORE_CONF_hadoop_http_staticuser_user=root
-CORE_CONF_hadoop_proxyuser_hue_hosts=*
-CORE_CONF_hadoop_proxyuser_hue_groups=*
-
-HDFS_CONF_dfs_webhdfs_enabled=true
-HDFS_CONF_dfs_permissions_enabled=false
-
-YARN_CONF_yarn_log___aggregation___enable=true
-YARN_CONF_yarn_resourcemanager_recovery_enabled=true
-YARN_CONF_yarn_resourcemanager_store_class=org.apache.hadoop.yarn.server.resourcemanager.recovery.FileSystemRMStateStore
-YARN_CONF_yarn_resourcemanager_fs_state___store_uri=/rmstate
-YARN_CONF_yarn_nodemanager_remote___app___log___dir=/app-logs
-YARN_CONF_yarn_log_server_url=http://{container_name_prefix}historyserver:8188/applicationhistory/logs/
-YARN_CONF_yarn_timeline___service_enabled=true
-YARN_CONF_yarn_timeline___service_generic___application___history_enabled=true
-YARN_CONF_yarn_resourcemanager_system___metrics___publisher_enabled=true
-YARN_CONF_yarn_resourcemanager_hostname={container_name_prefix}resourcemanager
-YARN_CONF_yarn_timeline___service_hostname={container_name_prefix}historyserver
-YARN_CONF_yarn_resourcemanager_address={container_name_prefix}resourcemanager:8032
-YARN_CONF_yarn_resourcemanager_scheduler_address={container_name_prefix}resourcemanager:8030
-YARN_CONF_yarn_resourcemanager_resource__tracker_address={container_name_prefix}resourcemanager:8031
diff --git a/test_container/tests/test/java/resources/hadoop_etl_udf/retail.sql b/test_container/tests/test/java/resources/hadoop_etl_udf/retail.sql
deleted file mode 100644
index 8fcf9ee..0000000
--- a/test_container/tests/test/java/resources/hadoop_etl_udf/retail.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-DROP DATABASE IF EXISTS RETAIL;
-CREATE DATABASE RETAIL;
-USE RETAIL;
-
-DROP TABLE IF EXISTS sales_positions;
-
-CREATE TABLE sales_positions (
-  sales_id    BIGINT,
-  position_id INT,
-  article_id  INT,
-  amount      INT,
-  price       DOUBLE,
-  voucher_id  INT,
-  canceled    BOOLEAN
-)
-STORED AS PARQUET
-TBLPROPERTIES ("parquet.compression"="SNAPPY");
-
-INSERT INTO TABLE sales_positions
-VALUES (1, 1, 1, 10, 10.0, 1, true), (2,2,2,20,20.0,2,false);
diff --git a/test_container/tests/test/java/resources/java_udf/pom.xml b/test_container/tests/test/java/resources/java_udf/pom.xml
deleted file mode 100644
index d9f5f58..0000000
--- a/test_container/tests/test/java/resources/java_udf/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.exasol.slc.testudf</groupId>
-    <artifactId>test-udf</artifactId>
-    <version>0.0.0</version>
-
-    <properties>
-        <java.version>17</java.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.exasol</groupId>
-            <artifactId>udf-api-java</artifactId>
-            <version>1.0.5</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>test-udf-java-${java.version}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-toolchains-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>toolchain</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <toolchains>
-                        <jdk>
-                            <version>${java.version}</version>
-                        </jdk>
-                    </toolchains>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <showWarnings>true</showWarnings>
-                    <compilerArgs>
-                        <arg>-Xlint:all,-requires-automatic,-requires-transitive-automatic</arg>
-                        <arg>-Werror</arg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.6.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/test_container/tests/test/java/resources/java_udf/src/main/java/com/exasol/slc/testudf/Main.java b/test_container/tests/test/java/resources/java_udf/src/main/java/com/exasol/slc/testudf/Main.java
deleted file mode 100644
index 15296fd..0000000
--- a/test_container/tests/test/java/resources/java_udf/src/main/java/com/exasol/slc/testudf/Main.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.exasol.slc.testudf;
-
-import java.lang.Runtime.Version;
-
-import com.exasol.ExaIterator;
-import com.exasol.ExaMetadata;
-
-
-public class Main {
-
-    private static boolean initCalled = false;
-
-    public Main() {
-        throw new RuntimeException("UDF client should not call constructor");
-    }
-
-    public static void init(ExaMetadata exa) throws Exception {
-        System.out.println("Init called");
-        initCalled = true;
-    }
-
-    public static void cleanup(ExaMetadata exa) throws Exception {
-        System.out.println("Cleanup called");
-    }
- 
-    public static int run(final ExaMetadata exa, final ExaIterator ctx) {
-        if(!initCalled) {
-            throw new RuntimeException("UDF client did not call init method");
-        }
-        final Version version = Runtime.version();
-        System.out.println("Java version: " + version);
-        return version.feature();
-    }
-}
diff --git a/test_container/tests/test/java/resources/java_udf/src/main/java/module-info.java b/test_container/tests/test/java/resources/java_udf/src/main/java/module-info.java
deleted file mode 100644
index 7d1b9ef..0000000
--- a/test_container/tests/test/java/resources/java_udf/src/main/java/module-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-module com.exasol.slc.testudf {
-    exports com.exasol.slc.testudf;
-    requires transitive udf.api.java;
-}
diff --git a/test_container/tests/test/java/script_import.py b/test_container/tests/test/java/script_import.py
deleted file mode 100755
index 011b5fd..0000000
--- a/test_container/tests/test/java/script_import.py
+++ /dev/null
@@ -1,662 +0,0 @@
-#!/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-from exasol_python_test_framework.exatest import useData
-
-
-class ScriptImport(udf.TestCase):
-
-    legacy_env_declaration = ""
-    ctpg_parser_env_declaration = "%env SCRIPT_OPTIONS_PARSER_VERSION=2;"
-    additional_env_declarations = [(legacy_env_declaration,), (ctpg_parser_env_declaration,)]
-
-    def setUp(self):
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('DROP SCHEMA FN3 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-        self.query('CREATE SCHEMA FN3')
-        self.query('OPEN SCHEMA FN2')
-
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            bottom()
-            RETURNS INT AS
-            class BOTTOM {
-                static int f() {
-                        return 42;
-                    }
-                }
-            /
-            '''))
-
-    def test_ImportError_is_catchable(self):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                catch_import_exception()
-                RETURNS int AS
-                class CATCH_IMPORT_EXCEPTION {
-                   static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        try {
-                            exa.importScript("x");
-                        }
-                        catch (ExaCompilationException ex) { }
-                        return 42;
-                    }
-                }
-                '''))
-        rows = self.query('SELECT catch_import_exception() FROM dual')
-        self.assertRowsEqual([(42,)], rows)
-
-    @useData(additional_env_declarations)
-    def test_preprocessed_ImportError_is_not_catchable(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                cannot_catch_import_exception()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %import X;
-                class CANNOT_CATCH_IMPORT_EXCEPTION {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        X.run(exa, ctx);
-                        return 42;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'script X not found'):
-            rows = self.query('SELECT cannot_catch_import_exception() FROM dual')
-
-    @useData(((legacy_env_declaration, 'No values found for %import statement'),
-              (ctpg_parser_env_declaration,
-               "Error parsing script options at line 1: \[1:8\] PARSE: Syntax error: Unexpected \'<eof>\'")))
-    def test_preprocessed_Import_missing_script_name(self, additional_env_declaration, expected_error):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                missing_import_script_exception()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %import
-                '''))
-        with self.assertRaisesRegex(Exception, expected_error):
-            rows = self.query('SELECT missing_import_script_exception() FROM dual')
-
-    @useData(((legacy_env_declaration, 'End of %import statement not found'),
-              (ctpg_parser_env_declaration,
-               "Error parsing script options at line 1: \[1:8\] PARSE: Syntax error: Unexpected \'<eof>\'")))
-    def test_preprocessed_Import_missing_script_name2(self, additional_env_declaration, expected_error):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                missing_import_script_exception2()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %import
-                class CANNOT_CATCH_IMPORT_EXCEPTION {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        X.run(exa, ctx);
-                        return 42;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, expected_error):
-            rows = self.query('SELECT missing_import_script_exception2() FROM dual')
-
-    @useData(((legacy_env_declaration, 'No values found for %import statement'),
-              (ctpg_parser_env_declaration,
-               "Error parsing script options at line 1: \[1:9\] PARSE: Syntax error: Unexpected \';\'")))
-    def test_preprocessed_Import_missing_script_name3(self, additional_env_declaration, expected_error):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                missing_import_script_exception3()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %import ;
-                class CANNOT_CATCH_IMPORT_EXCEPTION {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        X.run(exa, ctx);
-                        return 42;
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, expected_error):
-            rows = self.query('SELECT missing_import_script_exception3() FROM dual')
-
-    @useData(((legacy_env_declaration, 'End of %import statement not found'),
-              (ctpg_parser_env_declaration,
-               "Error parsing script options at line 1: \[1:10\] PARSE: Syntax error: Unexpected \'<eof>\'")))
-    def test_preprocessed_Import_missing_import_end(self, additional_env_declaration, expected_error):
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                missing_import_end_exception()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %import X'''))
-        with self.assertRaisesRegex(Exception, expected_error):
-            rows = self.query('SELECT missing_import_end_exception() FROM dual')
-
-    @useData(additional_env_declarations)
-    def test_import_is_case_sensitive(self, additional_env_declaration):
-        scripts = [
-            ('my_module', additional_env_declaration, 'my_module', 4711),
-            ('My_Module', additional_env_declaration, 'My_Module', 42),
-            ('MY_MODULE', additional_env_declaration, 'MY_MODULE', 1234),
-        ]
-        sql = '''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                "%s"()
-                RETURNS int AS
-                %s
-                class %s {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return %d;
-                    }
-                }
-                '''
-        for triple in scripts:
-            self.query(udf.fixindent(sql % triple))
-
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                import_case_sensitive()
-                RETURNS int AS
-                import java.lang.reflect.Method;
-                class IMPORT_CASE_SENSITIVE {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        Class<?> scriptClass = exa.importScript("\\"My_Module\\"");
-                        Class[] runParams = {exa.getClass().getInterfaces()[0], ctx.getClass().getInterfaces()[0]};
-                        Method runMethod = scriptClass.getDeclaredMethod("run", runParams);
-                        Object returnValue = runMethod.invoke(null, exa, ctx);
-                        return (returnValue instanceof Integer) ? (int) returnValue : 0;
-                    }
-                }
-                '''))
-        rows = self.query('SELECT import_case_sensitive() FROM DUAL')
-        self.assertRowsEqual([(42,)], rows)
-
-    @useData(additional_env_declarations)
-    def test_preprocessed_import_is_case_sensitive(self, additional_env_declaration):
-        scripts = [
-            ('my_module', additional_env_declaration, 'my_module', 4711),
-            ('My_Module', additional_env_declaration, 'My_Module', 42),
-            ('MY_MODULE', additional_env_declaration, 'MY_MODULE', 1234),
-        ]
-        sql = '''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                "%s"()
-                RETURNS int AS
-                %s
-                class %s {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return %d;
-                    }
-                }
-                '''
-        for triple in scripts:
-            self.query(udf.fixindent(sql % triple))
-
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                preprocessed_import_case_sensitive()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %import "My_Module";
-                class PREPROCESSED_IMPORT_CASE_SENSITIVE {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return My_Module.run(exa, ctx);
-                    }
-                }
-                '''))
-        rows = self.query('SELECT preprocessed_import_case_sensitive() FROM DUAL')
-        self.assertRowsEqual([(42,)], rows)
-
-    @useData(additional_env_declarations)
-    def test_preprocessed_import_tab(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-            CREATE OR REPLACE java SCALAR SCRIPT
-            X()
-            RETURNS int AS
-            ''' + additional_env_declaration + '''
-            class X {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return 1;
-                }
-            }
-            '''))
-
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                preprocessed_import_case_tab()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %import		X;
-                class PREPROCESSED_IMPORT_CASE_TAB {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return X.run(exa, ctx);
-                    }
-                }
-                '''))
-        rows = self.query('SELECT preprocessed_import_case_tab() FROM DUAL')
-        self.assertRowsEqual([(1,)], rows)
-
-    @useData(additional_env_declarations)
-    def test_preprocessed_import_quoted_whitespaces(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-            CREATE OR REPLACE java SCALAR SCRIPT
-            "X 	 "()
-            RETURNS int AS
-            ''' + additional_env_declaration + '''
-            class X {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return 1;
-                }
-            }
-            '''))
-
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                preprocessed_import_case_tab_end()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %import		"X 	 ";
-                class PREPROCESSED_IMPORT_CASE_TAB_END {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return X.run(exa, ctx);
-                    }
-                }
-                '''))
-        rows = self.query('SELECT preprocessed_import_case_tab_end() FROM DUAL')
-        self.assertRowsEqual([(1,)], rows)
-
-    @useData(additional_env_declarations)
-    def test_preprocessed_import_unquoted_whitespaces(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-            CREATE OR REPLACE java SCALAR SCRIPT
-            X()
-            RETURNS int AS
-            ''' + additional_env_declaration + '''
-            class X {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return 1;
-                }
-            }
-            '''))
-
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                preprocessed_import_case_tab_end()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %import		X 	 ;
-                class PREPROCESSED_IMPORT_CASE_TAB_END {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return X.run(exa, ctx);
-                    }
-                }
-                '''))
-        rows = self.query('SELECT preprocessed_import_case_tab_end() FROM DUAL')
-        self.assertRowsEqual([(1,)], rows)
-
-    @useData(additional_env_declarations)
-    def test_preprocessed_import_multiple(self, additional_env_declaration):
-        scripts = [
-            ('A', additional_env_declaration, 'A', 1),
-            ('B', additional_env_declaration, 'B', 2),
-            ('C', additional_env_declaration, 'C', 3),
-        ]
-        sql = '''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                "%s"()
-                RETURNS int AS
-                %s
-                %%import A;
-                %%import B;
-                %%import C;
-                class %s {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return %d;
-                    }
-                }
-                '''
-        for triple in scripts:
-            self.query(udf.fixindent(sql % triple))
-
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                X()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %import A;
-                %import B;
-                %import C;
-                class X {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return A.run(exa, ctx) + B.run(exa, ctx) + C.run(exa, ctx);
-                    }
-                }
-                '''))
-        rows = self.query('SELECT X() FROM DUAL')
-        self.assertRowsEqual([(6,)], rows)
-
-    @useData(additional_env_declarations)
-    def test_preprocessed_import_recursive(self, additional_env_declaration):
-        sql = '''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                A()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %import B;
-                class A {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 1 + B.run(exa, ctx);
-                    }
-                }
-                '''
-        self.query(udf.fixindent(sql))
-        sql = '''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                B()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %import C;
-                class B {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 2 + C.run(exa, ctx);
-                    }
-                }
-                '''
-        self.query(udf.fixindent(sql))
-        sql = '''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                C()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                class C {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return 3;
-                    }
-                }
-                '''
-        self.query(udf.fixindent(sql))
-
-        self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                X()
-                RETURNS int AS
-                ''' + additional_env_declaration + '''
-                %import A;
-                class X {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return A.run(exa, ctx);
-                    }
-                }
-                '''))
-        rows = self.query('SELECT X() FROM DUAL')
-        self.assertRowsEqual([(6,)], rows)
-
-    @useData(additional_env_declarations)
-    def test_import_works(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            foo()
-            RETURNS INT AS
-            ''' + additional_env_declaration + '''
-            %import bottom;
-            class FOO {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return BOTTOM.f();
-                }
-            }
-            /
-            '''))
-        rows = self.query('SELECT foo() FROM DUAL')
-        self.assertRowsEqual([(42,)], rows)
-
-    @useData(additional_env_declarations)
-    def test_import_is_semi_case_sensitive(self, additional_env_declaration):
-        def check(import_name, classname, n):
-            self.query(udf.fixindent('''
-                CREATE OR REPLACE java SCALAR SCRIPT
-                foo()
-                RETURNS INT AS
-                %s
-                %%import %s;
-                class FOO {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return %s.f();
-                    }
-                }
-                /''' % (additional_env_declaration, import_name, classname)))
-            self.assertRowsEqual([(n,)],
-                                 self.query('SELECT foo() FROM DUAL'))
-
-        for name in 'bar', 'Bar', 'BAR':
-            self.query(udf.fixindent('''
-                CREATE java SCALAR SCRIPT
-                "%s"()
-                RETURNS INT AS
-                %s
-                class %s {
-                    static int f() {
-                            return %d;
-                    }
-                }
-                /''' % (name, additional_env_declaration, name, sum(x.isupper() for x in name))
-                                     ))
-
-        check("bar", "BAR", 3)
-        check("Bar", "BAR", 3)
-        check("\"Bar\"", "Bar", 1)
-        check("\"bar\"", "bar", 0)
-
-    @useData(additional_env_declarations)
-    def test_import_fails_for_lua_script(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            foo()
-            RETURNS INT AS
-            ''' + additional_env_declaration + '''
-            %import bar;
-            class FOO {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return BAR.f();
-                }
-            }
-            /
-            '''))
-        self.query(udf.fixindent('''
-            CREATE lua SCALAR SCRIPT
-            bar()
-            RETURNS DOUBLE AS
-            ''' + additional_env_declaration + '''
-            function f()
-                return 32
-            end
-            /
-            '''))
-        with self.assertRaisesRegex(Exception, 'VM error:.* wrong language LUA'):
-            self.query('SELECT foo() FROM DUAL')
-
-    @useData(additional_env_declarations)
-    def test_import_fails_for_r_script(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            foo()
-            RETURNS INT AS
-            ''' + additional_env_declaration + '''
-            %import bar;
-            class FOO {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return BAR.f();
-                }
-            }
-            /
-            '''))
-        self.query(udf.fixindent('''
-            CREATE r SCALAR SCRIPT
-            bar()
-            RETURNS DOUBLE AS
-            ''' + additional_env_declaration + '''
-
-            f <- function() {
-                32
-            }
-            /
-            '''))
-        with self.assertRaisesRegex(Exception, 'VM error:.* wrong language R'):
-            self.query('SELECT foo() FROM DUAL')
-
-    @useData(additional_env_declarations)
-    def test_import_fails_for_python_script(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            foo()
-            RETURNS INT AS
-            ''' + additional_env_declaration + '''
-            %import bar;
-            class FOO {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return BAR.f();
-                }
-            }
-            /
-            '''))
-        self.query(udf.fixindent('''
-            CREATE python3 SCALAR SCRIPT
-            bar()
-            RETURNS DOUBLE AS
-            ''' + additional_env_declaration + '''
-            def f():
-                return 32
-            /
-            '''))
-        with self.assertRaisesRegex(Exception, 'VM error:.* wrong language PYTHON3'):
-            self.query('SELECT foo() FROM DUAL')
-
-    @useData([
-        ('fn2', 'bottom', 'BOTTOM', ''),
-        ('fn2', 'fn2.bottom', 'BOTTOM', ''),
-        ('fn2', 'exa_db.fn2.bottom', 'BOTTOM', ''),
-        ('fn3', 'fn2.bottom', 'BOTTOM', ''),
-        ('fn3', 'exa_db.fn2.bottom', 'BOTTOM', ''),
-        ('fn2', 'bottom', 'BOTTOM', "%env SCRIPT_OPTIONS_PARSER_VERSION=2;"),
-        ('fn2', 'fn2.bottom', 'BOTTOM', "%env SCRIPT_OPTIONS_PARSER_VERSION=2;"),
-        ('fn2', 'exa_db.fn2.bottom', 'BOTTOM', "%env SCRIPT_OPTIONS_PARSER_VERSION=2;"),
-        ('fn3', 'fn2.bottom', 'BOTTOM', "%env SCRIPT_OPTIONS_PARSER_VERSION=2;"),
-        ('fn3', 'exa_db.fn2.bottom', 'BOTTOM', "%env SCRIPT_OPTIONS_PARSER_VERSION=2;"),
-    ])
-    def test_import_works_with_qualified_names(self, schema, name, classname, additional_env_declaration):
-        self.query('OPEN SCHEMA %s' % schema)
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            foo()
-            RETURNS INT AS
-            %s
-            %%import %s;
-            class FOO {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return %s.f();
-                }
-            }
-            /
-            ''' % (additional_env_declaration, name, classname)))
-        rows = self.query('SELECT foo() FROM DUAL')
-        self.assertRowsEqual([(42,)], rows)
-
-    @useData(additional_env_declarations)
-    def test_chained_import_works_via_function_call(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            foo()
-            RETURNS INT AS
-            ''' + additional_env_declaration + '''
-            %import bar;
-            class FOO {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return BAR.b();
-                }
-            }
-            /
-            '''))
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            bar()
-            RETURNS INT AS
-            ''' + additional_env_declaration + '''
-            %import bottom;
-            class BAR {
-                static int b() {
-                    return BOTTOM.f();
-                }
-            }
-            /
-            '''))
-        rows = self.query('SELECT foo() FROM DUAL')
-        self.assertRowsEqual([(42,)], rows)
-
-    @useData(additional_env_declarations)
-    def test_mutual_import_works(self, additional_env_declaration):
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            ping()
-            RETURNS INT AS
-            ''' + additional_env_declaration + '''
-            %import pong;
-            class PING {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return ping(42);
-                }
-                static int ping(int n) {
-                    if (n > 0)
-                        return PONG.pong(n - 1) + 1;
-                    else
-                        return 0;
-                }
-            }
-            /
-            '''))
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            pong()
-            RETURNS INT AS
-            ''' + additional_env_declaration + '''
-            %import ping;
-            class PONG {
-                static int pong(int n) {
-                    if (n > 0)
-                        return PING.ping(n - 1) + 1;
-                    else
-                        return 0;
-                }
-            }
-            /
-            '''))
-        rows = self.query('SELECT ping() FROM DUAL')
-        self.assertRowsEqual([(42,)], rows)
-
-    @useData(additional_env_declarations)
-    def testImportWithView(self, additional_env_declaration):
-        self.createUser("foo", "foo")
-        self.commit()
-        self.query(udf.fixindent('''
-            CREATE java SCALAR SCRIPT
-            spot42542script()
-            RETURNS INT AS
-            ''' + additional_env_declaration + '''
-            %import bottom;
-            class SPOT42542SCRIPT {
-                static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    return BOTTOM.f();
-                }
-            }
-            /
-            '''))
-        self.query("create or replace view FN2.spot42542_view as SELECT spot42542script() as col FROM DUAL")
-        self.query("grant select on FN2.spot42542_view to foo")
-        self.commit()
-        rows = self.query('''select * from FN2.spot42542_view''')
-        self.assertRowsEqual([(42,)], rows)
-        foo_conn = self.getConnection('foo', 'foo')
-        rows = foo_conn.query('''select * from FN2.spot42542_view''')
-        self.assertRowsEqual([(42,)], rows)
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/java/specific_types.py b/test_container/tests/test/java/specific_types.py
deleted file mode 100755
index d94aada..0000000
--- a/test_container/tests/test/java/specific_types.py
+++ /dev/null
@@ -1,1152 +0,0 @@
-#!/usr/bin/env python3
-# encoding: utf8
-
-from exasol_python_test_framework import udf
-
-
-class JavaTypesInteger(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-        self.query('CREATE TABLE T (intVal DECIMAL(9,0), longVal DECIMAL(18,0), bigdecimalVal DECIMAL(36,0), decimalVal DECIMAL(9,2), \
-                    doubleVal DOUBLE, doubleIntVal DOUBLE, stringVal VARCHAR(100), booleanVal BOOLEAN, dateVal DATE, timestampVal TIMESTAMP)')
-        self.query('''INSERT INTO T values (123456789, 123456789123456789, 123456789123456789123456789123456789, 1234567.12, \
-                    123456789.123, 15.0, 'string#String!12345', true, '2014-05-21', '2014-05-21 15:13:30.123')''')
-
-    def test_integer_integer(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                INT_INT(x SHORTINT) RETURNS SHORTINT AS
-                class INT_INT {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getInteger("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT INT_INT(intVal) FROM T')
-        self.assertRowsEqual([(123456789,)], rows)
-
-    def test_integer_long(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                INT_LONG(x INTEGER) RETURNS SHORTINT AS
-                class INT_LONG {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getInteger("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'column can only have maximum value of'):
-            rows = self.query('SELECT INT_LONG(longVal) FROM T')
-
-    def test_integer_bigdecimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                INT_BIGDEC(x BIGINT) RETURNS SHORTINT AS
-                class INT_BIGDEC {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getInteger("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'java.lang.ArithmeticException: Overflow'):
-            rows = self.query('SELECT INT_BIGDEC(bigdecimalVal) FROM T')
-
-    def test_integer_decimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                INT_DECIMAL(x DECIMAL(9,2)) RETURNS SHORTINT AS
-                class INT_DECIMAL {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getInteger("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'java.lang.ArithmeticException: Rounding necessary'):
-            rows = self.query('SELECT INT_DECIMAL(decimalVal) FROM T')
-
-    def test_integer_double(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                INT_DOUBLE(x DOUBLE) RETURNS SHORTINT AS
-                class INT_DOUBLE {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getInteger("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'has a non-integer value of'):
-            rows = self.query('SELECT INT_DOUBLE(doubleVal) FROM T')
-
-    def test_integer_double_int(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                INT_DOUBLE_INT(x DOUBLE) RETURNS SHORTINT AS
-                class INT_DOUBLE_INT {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getInteger("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT INT_DOUBLE_INT(doubleIntVal) FROM T')
-        self.assertRowsEqual([(15,)], rows)
-
-    def test_integer_string(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                INT_STRING(x VARCHAR(100)) RETURNS SHORTINT AS
-                class INT_STRING {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getInteger("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getInteger cannot convert column'):
-            rows = self.query('SELECT INT_STRING(stringVal) FROM T')
-
-    def test_integer_boolean(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                INT_BOOL(x BOOLEAN) RETURNS SHORTINT AS
-                class INT_BOOL {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getInteger("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getInteger cannot convert column'):
-            rows = self.query('SELECT INT_BOOL(booleanVal) FROM T')
-
-    def test_integer_date(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                INT_DATE(x DATE) RETURNS SHORTINT AS
-                class INT_DATE {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getInteger("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getInteger cannot convert column'):
-            rows = self.query('SELECT INT_DATE(dateVal) FROM T')
-
-    def test_integer_timestamp(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                INT_TIMESTAMP(x TIMESTAMP) RETURNS SHORTINT AS
-                class INT_TIMESTAMP {
-                    static int run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getInteger("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getInteger cannot convert column'):
-            rows = self.query('SELECT INT_TIMESTAMP(timestampVal) FROM T')
-
-class JavaTypesLong(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-        self.query('CREATE TABLE T (intVal DECIMAL(9,0), longVal DECIMAL(18,0), bigdecimalVal DECIMAL(36,0), decimalVal DECIMAL(9,2), \
-                    doubleVal DOUBLE, doubleIntVal DOUBLE, stringVal VARCHAR(100), booleanVal BOOLEAN, dateVal DATE, timestampVal TIMESTAMP)')
-        self.query('''INSERT INTO T values (123456789, 123456789123456789, 123456789123456789123456789123456789, 1234567.12, \
-                    123456789.123, 15.0, 'string#String!12345', true, '2014-05-21', '2014-05-21 15:13:30.123')''')
-
-    def test_long_integer(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                LONG_INT(x SHORTINT) RETURNS INTEGER AS
-                class LONG_INT {
-                    static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getLong("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT LONG_INT(intVal) FROM T')
-        self.assertRowsEqual([(123456789,)], rows)
-
-    def test_long_long(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                LONG_LONG(x INTEGER) RETURNS INTEGER AS
-                class LONG_LONG {
-                    static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getLong("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT LONG_LONG(longVal) FROM T')
-        self.assertRowsEqual([(123456789123456789,)], rows)
-
-    def test_long_bigdecimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                LONG_BIGDEC(x BIGINT) RETURNS INTEGER AS
-                class LONG_BIGDEC {
-                    static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getLong("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'java.lang.ArithmeticException: Overflow'):
-            rows = self.query('SELECT LONG_BIGDEC(bigdecimalVal) FROM T')
-
-    def test_long_decimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                LONG_DECIMAL(x DECIMAL(9,2)) RETURNS INTEGER AS
-                class LONG_DECIMAL {
-                    static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getLong("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'java.lang.ArithmeticException: Rounding necessary'):
-            rows = self.query('SELECT LONG_DECIMAL(decimalVal) FROM T')
-
-    def test_long_double(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                LONG_DOUBLE(x DOUBLE) RETURNS INTEGER AS
-                class LONG_DOUBLE {
-                    static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getLong("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'has a non-integer value of'):
-            rows = self.query('SELECT LONG_DOUBLE(doubleVal) FROM T')
-
-    def test_long_double_int(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                LONG_DOUBLE_INT(x DOUBLE) RETURNS INTEGER AS
-                class LONG_DOUBLE_INT {
-                    static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getLong("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT LONG_DOUBLE_INT(doubleIntVal) FROM T')
-        self.assertRowsEqual([(15,)], rows)
-
-    def test_long_string(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                LONG_STRING(x VARCHAR(100)) RETURNS INTEGER AS
-                class LONG_STRING {
-                    static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getLong("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getLong cannot convert column'):
-            rows = self.query('SELECT LONG_STRING(stringVal) FROM T')
-
-    def test_long_boolean(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                LONG_BOOL(x BOOLEAN) RETURNS INTEGER AS
-                class LONG_BOOL {
-                    static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getLong("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getLong cannot convert column'):
-            rows = self.query('SELECT LONG_BOOL(booleanVal) FROM T')
-
-    def test_long_date(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                LONG_DATE(x DATE) RETURNS INTEGER AS
-                class LONG_DATE {
-                    static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getLong("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getLong cannot convert column'):
-            rows = self.query('SELECT LONG_DATE(dateVal) FROM T')
-
-    def test_long_timestamp(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                LONG_TIMESTAMP(x TIMESTAMP) RETURNS INTEGER AS
-                class LONG_TIMESTAMP {
-                    static long run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getLong("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getLong cannot convert column'):
-            rows = self.query('SELECT LONG_TIMESTAMP(timestampVal) FROM T')
-
-class JavaTypesBigDecimal(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-        self.query('CREATE TABLE T (intVal DECIMAL(9,0), longVal DECIMAL(18,0), bigdecimalVal DECIMAL(36,0), decimalVal DECIMAL(9,2), \
-                    doubleVal DOUBLE, doubleIntVal DOUBLE, stringVal VARCHAR(100), booleanVal BOOLEAN, dateVal DATE, timestampVal TIMESTAMP)')
-        self.query('''INSERT INTO T values (123456789, 123456789123456789, 123456789123456789123456789123456789, 1234567.12, \
-                    123456789.123, 15.0, 'string#String!12345', true, '2014-05-21', '2014-05-21 15:13:30.123')''')
-
-    def test_bigdecimal_integer(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BIGDECIMAL_INT(x SHORTINT) RETURNS BIGINT AS
-                import java.math.BigDecimal;
-                class BIGDECIMAL_INT {
-                    static BigDecimal run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBigDecimal("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT BIGDECIMAL_INT(intVal) FROM T')
-        self.assertRowsEqual([(123456789,)], rows)
-
-    def test_bigdecimal_long(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BIGDECIMAL_LONG(x INTEGER) RETURNS BIGINT AS
-                import java.math.BigDecimal;
-                class BIGDECIMAL_LONG {
-                    static BigDecimal run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBigDecimal("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT BIGDECIMAL_LONG(longVal) FROM T')
-        self.assertRowsEqual([(123456789123456789,)], rows)
-
-    def test_bigdecimal_bigdecimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BIGDECIMAL_BIGDEC(x BIGINT) RETURNS BIGINT AS
-                import java.math.BigDecimal;
-                class BIGDECIMAL_BIGDEC {
-                    static BigDecimal run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBigDecimal("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT BIGDECIMAL_BIGDEC(bigdecimalVal) FROM T')
-        self.assertRowsEqual([(123456789123456789123456789123456789,)], rows)
-
-    def test_bigdecimal_decimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BIGDECIMAL_DECIMAL(x DECIMAL(9,2)) RETURNS VARCHAR(100) AS
-                import java.math.BigDecimal;
-                class BIGDECIMAL_DECIMAL {
-                    static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBigDecimal("x").toString();
-                    }
-                }
-                '''))
-        rows = self.query('SELECT BIGDECIMAL_DECIMAL(decimalVal) FROM T')
-        self.assertRowsEqual([('1234567.12',)], rows)
-
-    def test_bigdecimal_double(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BIGDECIMAL_DOUBLE(x DOUBLE) RETURNS VARCHAR(100) AS
-                import java.math.BigDecimal;
-                class BIGDECIMAL_DOUBLE {
-                    static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBigDecimal("x").toString();
-                    }
-                }
-                '''))
-        rows = self.query('''SELECT 'OK' FROM (SELECT CAST(BIGDECIMAL_DOUBLE(doubleVal) as DOUBLE) as val FROM T) WHERE val BETWEEN 123456789.122999 AND 123456789.1230001''')
-        self.assertRowsEqual([('OK',)], rows)
-
-    def test_bigdecimal_double_int(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BIGDECIMAL_DOUBLE_INT(x DOUBLE) RETURNS BIGINT AS
-                import java.math.BigDecimal;
-                class BIGDECIMAL_DOUBLE_INT {
-                    static BigDecimal run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBigDecimal("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT BIGDECIMAL_DOUBLE_INT(doubleIntVal) FROM T')
-        self.assertRowsEqual([(15,)], rows)
-
-    def test_bigdecimal_string(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BIGDECIMAL_STRING(x VARCHAR(100)) RETURNS BIGINT AS
-                import java.math.BigDecimal;
-                class BIGDECIMAL_STRING {
-                    static BigDecimal run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBigDecimal("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getBigDecimal cannot convert column'):
-            rows = self.query('SELECT BIGDECIMAL_STRING(stringVal) FROM T')
-
-    def test_bigdecimal_boolean(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BIGDECIMAL_BOOL(x BOOLEAN) RETURNS BIGINT AS
-                import java.math.BigDecimal;
-                class BIGDECIMAL_BOOL {
-                    static BigDecimal run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBigDecimal("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getBigDecimal cannot convert column'):
-            rows = self.query('SELECT BIGDECIMAL_BOOL(booleanVal) FROM T')
-
-    def test_bigdecimal_date(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BIGDECIMAL_DATE(x DATE) RETURNS BIGINT AS
-                import java.math.BigDecimal;
-                class BIGDECIMAL_DATE {
-                    static BigDecimal run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBigDecimal("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getBigDecimal cannot convert column'):
-            rows = self.query('SELECT BIGDECIMAL_DATE(dateVal) FROM T')
-
-    def test_bigdecimal_timestamp(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BIGDECIMAL_TIMESTAMP(x TIMESTAMP) RETURNS BIGINT AS
-                import java.math.BigDecimal;
-                class BIGDECIMAL_TIMESTAMP {
-                    static BigDecimal run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBigDecimal("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getBigDecimal cannot convert column'):
-            rows = self.query('SELECT BIGDECIMAL_TIMESTAMP(timestampVal) FROM T')
-
-class JavaTypesDouble(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-        self.query('CREATE TABLE T (intVal DECIMAL(9,0), longVal DECIMAL(18,0), bigdecimalVal DECIMAL(36,0), decimalVal DECIMAL(9,2), \
-                    doubleVal DOUBLE, doubleIntVal DOUBLE, stringVal VARCHAR(100), booleanVal BOOLEAN, dateVal DATE, timestampVal TIMESTAMP)')
-        self.query('''INSERT INTO T values (123456789, 123456789123456789, 123456789123456789123456789123456789, 1234567.12, \
-                    123456789.123, 15.0, 'string#String!12345', true, '2014-05-21', '2014-05-21 15:13:30.123')''')
-
-    def test_double_integer(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DOUBLE_INT(x SHORTINT) RETURNS DOUBLE AS
-                class DOUBLE_INT {
-                    static double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDouble("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT DOUBLE_INT(intVal) FROM T')
-        self.assertRowsEqual([(123456789,)], rows)
-
-    def test_double_long(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DOUBLE_LONG(x INTEGER) RETURNS DOUBLE AS
-                class DOUBLE_LONG {
-                    static double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDouble("x");
-                    }
-                }
-                '''))
-        rows = self.query('''SELECT TO_CHAR(DOUBLE_LONG(longVal), '9.99999999999999EEEE') FROM T''')
-        self.assertRowsEqual([('1.23456789123457E17',)], rows)
-
-    def test_double_bigdecimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DOUBLE_BIGDEC(x BIGINT) RETURNS DOUBLE AS
-                class DOUBLE_BIGDEC {
-                    static double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDouble("x");
-                    }
-                }
-                '''))
-        rows = self.query('''SELECT TO_CHAR(DOUBLE_BIGDEC(bigdecimalVal), '9.99999999999999EEEE') FROM T''')
-        self.assertRowsEqual([('1.23456789123457E35',)], rows)
-
-    def test_double_decimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DOUBLE_DECIMAL(x DECIMAL(9,2)) RETURNS DOUBLE AS
-                class DOUBLE_DECIMAL {
-                    static double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDouble("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT DOUBLE_DECIMAL(decimalVal) FROM T')
-        self.assertRowsEqual([(1234567.12,)], rows)
-
-    def test_double_double(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DOUBLE_DOUBLE(x DOUBLE) RETURNS DOUBLE AS
-                class DOUBLE_DOUBLE {
-                    static double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDouble("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT DOUBLE_DOUBLE(doubleVal) FROM T')
-        self.assertRowsEqual([(123456789.123,)], rows)
-
-    def test_double_double_int(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DOUBLE_DOUBLE_INT(x DOUBLE) RETURNS DOUBLE AS
-                class DOUBLE_DOUBLE_INT {
-                    static double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDouble("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT DOUBLE_DOUBLE_INT(doubleIntVal) FROM T')
-        self.assertRowsEqual([(15,)], rows)
-
-    def test_double_string(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DOUBLE_STRING(x VARCHAR(100)) RETURNS DOUBLE AS
-                class DOUBLE_STRING {
-                    static double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDouble("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getDouble cannot convert column'):
-            rows = self.query('SELECT DOUBLE_STRING(stringVal) FROM T')
-
-    def test_double_boolean(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DOUBLE_BOOL(x BOOLEAN) RETURNS DOUBLE AS
-                class DOUBLE_BOOL {
-                    static double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDouble("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getDouble cannot convert column'):
-            rows = self.query('SELECT DOUBLE_BOOL(booleanVal) FROM T')
-
-    def test_double_date(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DOUBLE_DATE(x DATE) RETURNS DOUBLE AS
-                class DOUBLE_DATE {
-                    static double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDouble("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getDouble cannot convert column'):
-            rows = self.query('SELECT DOUBLE_DATE(dateVal) FROM T')
-
-    def test_double_timestamp(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DOUBLE_TIMESTAMP(x TIMESTAMP) RETURNS DOUBLE AS
-                class DOUBLE_TIMESTAMP {
-                    static double run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDouble("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getDouble cannot convert column'):
-            rows = self.query('SELECT DOUBLE_TIMESTAMP(timestampVal) FROM T')
-
-class JavaTypesString(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-        self.query('CREATE TABLE T (intVal DECIMAL(9,0), longVal DECIMAL(18,0), bigdecimalVal DECIMAL(36,0), decimalVal DECIMAL(9,2), \
-                    doubleVal DOUBLE, doubleIntVal DOUBLE, stringVal VARCHAR(100), booleanVal BOOLEAN, dateVal DATE, timestampVal TIMESTAMP)')
-        self.query('''INSERT INTO T values (123456789, 123456789123456789, 123456789123456789123456789123456789, 1234567.12, \
-                    123456789.123, 15.0, 'string#String!12345', true, '2014-05-21', '2014-05-21 15:13:30.123')''')
-
-    def test_string_integer(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                STRING_INT(x SHORTINT) RETURNS VARCHAR(100) AS
-                class STRING_INT {
-                    static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getString("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT STRING_INT(intVal) FROM T')
-        self.assertRowsEqual([('123456789',)], rows)
-
-    def test_string_long(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                STRING_LONG(x INTEGER) RETURNS VARCHAR(100) AS
-                class STRING_LONG {
-                    static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getString("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT STRING_LONG(longVal) FROM T')
-        self.assertRowsEqual([('123456789123456789',)], rows)
-
-    def test_string_bigdecimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                STRING_BIGDEC(x BIGINT) RETURNS VARCHAR(100) AS
-                class STRING_BIGDEC {
-                    static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getString("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT STRING_BIGDEC(bigdecimalVal) FROM T')
-        self.assertRowsEqual([('123456789123456789123456789123456789',)], rows)
-
-    def test_string_decimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                STRING_DECIMAL(x DECIMAL(9,2)) RETURNS VARCHAR(100) AS
-                class STRING_DECIMAL {
-                    static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getString("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT STRING_DECIMAL(decimalVal) FROM T')
-        self.assertRowsEqual([('1234567.12',)], rows)
-
-    def test_string_double(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                STRING_DOUBLE(x DOUBLE) RETURNS VARCHAR(100) AS
-                class STRING_DOUBLE {
-                    static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getString("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT STRING_DOUBLE(doubleVal) FROM T')
-        self.assertRowsEqual([('1.23456789123E8',)], rows)
-
-    def test_string_double_int(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                STRING_DOUBLE_INT(x DOUBLE) RETURNS VARCHAR(100) AS
-                class STRING_DOUBLE_INT {
-                    static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getString("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT STRING_DOUBLE_INT(doubleIntVal) FROM T')
-        self.assertRowsEqual([('15.0',)], rows)
-
-    def test_string_string(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                STRING_STRING(x VARCHAR(100)) RETURNS VARCHAR(100) AS
-                class STRING_STRING {
-                    static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getString("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT STRING_STRING(stringVal) FROM T')
-        self.assertRowsEqual([('string#String!12345',)], rows)
-
-    def test_string_boolean(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                STRING_BOOL(x BOOLEAN) RETURNS VARCHAR(100) AS
-                class STRING_BOOL {
-                    static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getString("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT STRING_BOOL(booleanVal) FROM T')
-        self.assertRowsEqual([('true',)], rows)
-
-    def test_string_date(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                STRING_DATE(x DATE) RETURNS VARCHAR(100) AS
-                class STRING_DATE {
-                    static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getString("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT STRING_DATE(dateVal) FROM T')
-        self.assertRowsEqual([('2014-05-21',)], rows)
-
-    def test_string_timestamp(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                STRING_TIMESTAMP(x TIMESTAMP) RETURNS VARCHAR(100) AS
-                class STRING_TIMESTAMP {
-                    static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getString("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT STRING_TIMESTAMP(timestampVal) FROM T')
-        self.assertRowsEqual([('2014-05-21 15:13:30.123',)], rows)
-
-class JavaTypesBoolean(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-        self.query('CREATE TABLE T (intVal DECIMAL(9,0), longVal DECIMAL(18,0), bigdecimalVal DECIMAL(36,0), decimalVal DECIMAL(9,2), \
-                    doubleVal DOUBLE, doubleIntVal DOUBLE, stringVal VARCHAR(100), booleanVal BOOLEAN, dateVal DATE, timestampVal TIMESTAMP)')
-        self.query('''INSERT INTO T values (123456789, 123456789123456789, 123456789123456789123456789123456789, 1234567.12, \
-                    123456789.123, 15.0, 'string#String!12345', true, '2014-05-21', '2014-05-21 15:13:30.123')''')
-
-    def test_boolean_integer(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BOOLEAN_INT(x SHORTINT) RETURNS BOOLEAN AS
-                class BOOLEAN_INT {
-                    static boolean run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBoolean("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getBoolean cannot convert column'):
-            rows = self.query('SELECT BOOLEAN_INT(intVal) FROM T')
-
-    def test_boolean_long(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BOOLEAN_LONG(x INTEGER) RETURNS BOOLEAN AS
-                class BOOLEAN_LONG {
-                    static boolean run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBoolean("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getBoolean cannot convert column'):
-            rows = self.query('''SELECT TO_CHAR(BOOLEAN_LONG(longVal), '9.99999999999999EEEE') FROM T''')
-
-    def test_boolean_bigdecimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BOOLEAN_BIGDEC(x BIGINT) RETURNS BOOLEAN AS
-                class BOOLEAN_BIGDEC {
-                    static boolean run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBoolean("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getBoolean cannot convert column'):
-            rows = self.query('''SELECT TO_CHAR(BOOLEAN_BIGDEC(bigdecimalVal), '9.99999999999999EEEE') FROM T''')
-
-    def test_boolean_decimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BOOLEAN_DECIMAL(x DECIMAL(9,2)) RETURNS BOOLEAN AS
-                class BOOLEAN_DECIMAL {
-                    static boolean run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBoolean("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getBoolean cannot convert column'):
-            rows = self.query('SELECT BOOLEAN_DECIMAL(decimalVal) FROM T')
-
-    def test_boolean_double(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BOOLEAN_DOUBLE(x DOUBLE) RETURNS BOOLEAN AS
-                class BOOLEAN_DOUBLE {
-                    static boolean run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBoolean("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getBoolean cannot convert column'):
-            rows = self.query('SELECT BOOLEAN_DOUBLE(doubleVal) FROM T')
-
-    def test_boolean_double_int(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BOOLEAN_DOUBLE_INT(x DOUBLE) RETURNS BOOLEAN AS
-                class BOOLEAN_DOUBLE_INT {
-                    static boolean run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBoolean("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getBoolean cannot convert column'):
-            rows = self.query('SELECT BOOLEAN_DOUBLE_INT(doubleIntVal) FROM T')
-
-    def test_boolean_string(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BOOLEAN_STRING(x VARCHAR(100)) RETURNS BOOLEAN AS
-                class BOOLEAN_STRING {
-                    static boolean run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBoolean("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getBoolean cannot convert column'):
-            rows = self.query('SELECT BOOLEAN_STRING(stringVal) FROM T')
-
-    def test_boolean_boolean(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BOOLEAN_BOOL(x BOOLEAN) RETURNS BOOLEAN AS
-                class BOOLEAN_BOOL {
-                    static boolean run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBoolean("x");
-                    }
-                }
-                '''))
-        rows = self.query('''SELECT 'OK' FROM (SELECT BOOLEAN_BOOL(booleanVal) as val FROM T) WHERE val = TRUE''')
-        self.assertRowsEqual([('OK',)], rows)
-
-    def test_boolean_date(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BOOLEAN_DATE(x DATE) RETURNS BOOLEAN AS
-                class BOOLEAN_DATE {
-                    static boolean run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBoolean("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getBoolean cannot convert column'):
-            rows = self.query('SELECT BOOLEAN_DATE(dateVal) FROM T')
-
-    def test_boolean_timestamp(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                BOOLEAN_TIMESTAMP(x TIMESTAMP) RETURNS BOOLEAN AS
-                class BOOLEAN_TIMESTAMP {
-                    static boolean run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getBoolean("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getBoolean cannot convert column'):
-            rows = self.query('SELECT BOOLEAN_TIMESTAMP(timestampVal) FROM T')
-
-class JavaTypesDate(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-        self.query('CREATE TABLE T (intVal DECIMAL(9,0), longVal DECIMAL(18,0), bigdecimalVal DECIMAL(36,0), decimalVal DECIMAL(9,2), \
-                    doubleVal DOUBLE, doubleIntVal DOUBLE, stringVal VARCHAR(100), booleanVal BOOLEAN, dateVal DATE, timestampVal TIMESTAMP)')
-        self.query('''INSERT INTO T values (123456789, 123456789123456789, 123456789123456789123456789123456789, 1234567.12, \
-                    123456789.123, 15.0, 'string#String!12345', true, '2014-05-21', '2014-05-21 15:13:30.123')''')
-
-    def test_date_integer(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DATE_INT(x SHORTINT) RETURNS DATE AS
-                import java.sql.Date;
-                class DATE_INT {
-                    static Date run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDate("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getDate cannot convert column'):
-            rows = self.query('SELECT DATE_INT(intVal) FROM T')
-
-    def test_date_long(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DATE_LONG(x INTEGER) RETURNS DATE AS
-                import java.sql.Date;
-                class DATE_LONG {
-                    static Date run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDate("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getDate cannot convert column'):
-            rows = self.query('SELECT DATE_LONG(longVal) FROM T')
-
-    def test_date_bigdecimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DATE_BIGDEC(x BIGINT) RETURNS DATE AS
-                import java.sql.Date;
-                class DATE_BIGDEC {
-                    static Date run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDate("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getDate cannot convert column'):
-            rows = self.query('SELECT DATE_BIGDEC(bigdecimalVal) FROM T')
-
-    def test_date_decimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DATE_DECIMAL(x DECIMAL(9,2)) RETURNS DATE AS
-                import java.sql.Date;
-                class DATE_DECIMAL {
-                    static Date run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDate("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getDate cannot convert column'):
-            rows = self.query('SELECT DATE_DECIMAL(decimalVal) FROM T')
-
-    def test_date_double(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DATE_DOUBLE(x DOUBLE) RETURNS DATE AS
-                import java.sql.Date;
-                class DATE_DOUBLE {
-                    static Date run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDate("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getDate cannot convert column'):
-            rows = self.query('SELECT DATE_DOUBLE(doubleVal) FROM T')
-
-    def test_date_double_int(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DATE_DOUBLE_INT(x DOUBLE) RETURNS DATE AS
-                import java.sql.Date;
-                class DATE_DOUBLE_INT {
-                    static Date run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDate("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getDate cannot convert column'):
-            rows = self.query('SELECT DATE_DOUBLE_INT(doubleIntVal) FROM T')
-
-    def test_date_string(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DATE_STRING(x VARCHAR(100)) RETURNS DATE AS
-                import java.sql.Date;
-                class DATE_STRING {
-                    static Date run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDate("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getDate cannot convert column'):
-            rows = self.query('SELECT DATE_STRING(stringVal) FROM T')
-
-    def test_date_boolean(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DATE_BOOL(x BOOLEAN) RETURNS DATE AS
-                import java.sql.Date;
-                class DATE_BOOL {
-                    static Date run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDate("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getDate cannot convert column'):
-            rows = self.query('SELECT DATE_BOOL(booleanVal) FROM T')
-
-    def test_date_date(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DATE_DATE(x DATE) RETURNS DATE AS
-                import java.sql.Date;
-                class DATE_DATE {
-                    static Date run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDate("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT TO_CHAR(DATE_DATE(dateVal)) FROM T')
-        self.assertRowsEqual([('2014-05-21',)], rows)
-
-    def test_date_timestamp(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                DATE_TIMESTAMP(x TIMESTAMP) RETURNS DATE AS
-                import java.sql.Date;
-                class DATE_TIMESTAMP {
-                    static Date run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getDate("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getDate cannot convert column'):
-            rows = self.query('SELECT DATE_TIMESTAMP(timestampVal) FROM T')
-
-class JavaTypesTimestamp(udf.TestCase):
-    def setUp(self):
-        self.query('DROP SCHEMA FN2 CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA FN2')
-        self.query('CREATE TABLE T (intVal DECIMAL(9,0), longVal DECIMAL(18,0), bigdecimalVal DECIMAL(36,0), decimalVal DECIMAL(9,2), \
-                    doubleVal DOUBLE, doubleIntVal DOUBLE, stringVal VARCHAR(100), booleanVal BOOLEAN, dateVal DATE, timestampVal TIMESTAMP)')
-        self.query('''INSERT INTO T values (123456789, 123456789123456789, 123456789123456789123456789123456789, 1234567.12, \
-                    123456789.123, 15.0, 'string#String!12345', true, '2014-05-21', '2014-05-21 15:13:30.123')''')
-
-    def test_timestamp_integer(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                TIMESTAMP_INT(x SHORTINT) RETURNS TIMESTAMP AS
-                import java.sql.Timestamp;
-                class TIMESTAMP_INT {
-                    static Timestamp run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getTimestamp("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getTimestamp cannot convert column'):
-            rows = self.query('SELECT TIMESTAMP_INT(intVal) FROM T')
-
-    def test_timestamp_long(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                TIMESTAMP_LONG(x INTEGER) RETURNS TIMESTAMP AS
-                import java.sql.Timestamp;
-                class TIMESTAMP_LONG {
-                    static Timestamp run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getTimestamp("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getTimestamp cannot convert column'):
-            rows = self.query('SELECT TIMESTAMP_LONG(longVal) FROM T')
-
-    def test_timestamp_bigdecimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                TIMESTAMP_BIGDEC(x BIGINT) RETURNS TIMESTAMP AS
-                import java.sql.Timestamp;
-                class TIMESTAMP_BIGDEC {
-                    static Timestamp run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getTimestamp("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getTimestamp cannot convert column'):
-            rows = self.query('SELECT TIMESTAMP_BIGDEC(bigdecimalVal) FROM T')
-
-    def test_timestamp_decimal(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                TIMESTAMP_DECIMAL(x DECIMAL(9,2)) RETURNS TIMESTAMP AS
-                import java.sql.Timestamp;
-                class TIMESTAMP_DECIMAL {
-                    static Timestamp run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getTimestamp("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getTimestamp cannot convert column'):
-            rows = self.query('SELECT TIMESTAMP_DECIMAL(decimalVal) FROM T')
-
-    def test_timestamp_double(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                TIMESTAMP_DOUBLE(x DOUBLE) RETURNS TIMESTAMP AS
-                import java.sql.Timestamp;
-                class TIMESTAMP_DOUBLE {
-                    static Timestamp run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getTimestamp("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getTimestamp cannot convert column'):
-            rows = self.query('SELECT TIMESTAMP_DOUBLE(doubleVal) FROM T')
-
-    def test_timestamp_double_int(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                TIMESTAMP_DOUBLE_INT(x DOUBLE) RETURNS TIMESTAMP AS
-                import java.sql.Timestamp;
-                class TIMESTAMP_DOUBLE_INT {
-                    static Timestamp run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getTimestamp("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getTimestamp cannot convert column'):
-            rows = self.query('SELECT TIMESTAMP_DOUBLE_INT(doubleIntVal) FROM T')
-
-    def test_timestamp_string(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                TIMESTAMP_STRING(x VARCHAR(100)) RETURNS TIMESTAMP AS
-                import java.sql.Timestamp;
-                class TIMESTAMP_STRING {
-                    static Timestamp run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getTimestamp("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getTimestamp cannot convert column'):
-            rows = self.query('SELECT TIMESTAMP_STRING(stringVal) FROM T')
-
-    def test_timestamp_boolean(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                TIMESTAMP_BOOL(x BOOLEAN) RETURNS TIMESTAMP AS
-                import java.sql.Timestamp;
-                class TIMESTAMP_BOOL {
-                    static Timestamp run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getTimestamp("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getTimestamp cannot convert column'):
-            rows = self.query('SELECT TIMESTAMP_BOOL(booleanVal) FROM T')
-
-    def test_timestamp_date(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                TIMESTAMP_DATE(x DATE) RETURNS TIMESTAMP AS
-                import java.sql.Timestamp;
-                class TIMESTAMP_DATE {
-                    static Timestamp run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getTimestamp("x");
-                    }
-                }
-                '''))
-        with self.assertRaisesRegex(Exception, 'getTimestamp cannot convert column'):
-            rows = self.query('SELECT TIMESTAMP_DATE(dateVal) FROM T')
-
-    def test_timestamp_timestamp(self):
-        self.query(udf.fixindent('''
-                CREATE java SET SCRIPT
-                TIMESTAMP_TIMESTAMP(x TIMESTAMP) RETURNS TIMESTAMP AS
-                import java.sql.Timestamp;
-                class TIMESTAMP_TIMESTAMP {
-                    static Timestamp run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        return ctx.getTimestamp("x");
-                    }
-                }
-                '''))
-        rows = self.query('SELECT TO_CHAR(TIMESTAMP_TIMESTAMP(timestampVal)) FROM T')
-        self.assertRowsEqual([('2014-05-21 15:13:30.123000',)], rows)
-
-if __name__ == '__main__':
-    udf.main()
-
-# vim: ts=4:sts=4:sw=4:et:fdm=indent
diff --git a/test_container/tests/test/java/test_hadoop_etl_udfs.py b/test_container/tests/test/java/test_hadoop_etl_udfs.py
deleted file mode 100644
index e071ead..0000000
--- a/test_container/tests/test/java/test_hadoop_etl_udfs.py
+++ /dev/null
@@ -1,249 +0,0 @@
-#!/usr/bin/env python3
-
-import time
-import os
-from io import BytesIO
-import tarfile
-import unittest
-
-from exasol_python_test_framework import udf
-from exasol_python_test_framework import docker_db_environment
-from exasol_python_test_framework.udf.udf_debug import UdfDebugger
-from exasol_python_test_framework.exatest.utils import obj_from_json_file
-
-
-@unittest.skip("""ClassLoader.class.getDeclaredField("usr_paths") in addDirToJavaLibraryPath doesn't work in Java 17""")
-class JavaHive(udf.TestCase):
-
-    def setUp(self):
-        self.query('CREATE SCHEMA JAVA_HIVE', ignore_errors=True)
-        self.query('OPEN SCHEMA JAVA_HIVE')
-
-    def fill_hadoop_hive_env_template(self, resource_dir, env):
-        container_name_prefix = env.get_container_name_prefix()
-        with open(resource_dir + "/hadoop-hive.env") as f:
-            environment_file_lines = f.readlines()
-            environment_file_lines = [line.format(container_name_prefix=container_name_prefix).rstrip()
-                                      for line in environment_file_lines if line.rstrip() != ""]
-            return environment_file_lines
-
-    def start_namenode(self, env, environment_file_lines):
-        namenode = env.run(
-            name="namenode",
-            image="bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8",
-            environment=["CLUSTER_NAME=test"] + environment_file_lines,
-            ports={"50070/tcp": "50070"},
-        )
-        return namenode
-
-    def start_datanode(self, env, environment_file_lines, namenode):
-        datanode = env.run(
-            name="datanode",
-            image="bde2020/hadoop-datanode:2.0.0-hadoop2.7.4-java8",
-            environment=[
-                            "SERVICE_PRECONDITION={namenode}:50070".format(namenode=namenode.name)
-                        ] + environment_file_lines,
-            ports={"50075/tcp": "50075"},
-        )
-        return datanode
-
-    def start_hive_server(self, env, environment_file_lines, hive_metastore):
-        hive_server = env.run(
-            name="hive-server",
-            image="bde2020/hive:2.3.2-postgresql-metastore",
-            environment=[
-                            "HIVE_CORE_CONF_javax_jdo_option_ConnectionURL=jdbc:postgresql://{hive_metastore}/metastore" \
-                                .format(hive_metastore=hive_metastore.name),
-                            "SERVICE_PRECONDITION={hive_metastore}:9083" \
-                                .format(hive_metastore=hive_metastore.name)
-                        ] + environment_file_lines,
-            ports={"10000/tcp": "10000"},
-        )
-        return hive_server
-
-    def start_hive_metastore(self, env, environment_file_lines, namenode, datanode, hive_metastore_postgresql):
-        hive_metastore = env.run(
-            name="hive-metastore",
-            image="bde2020/hive:2.3.2-postgresql-metastore",
-            environment=[
-                            "SERVICE_PRECONDITION={namenode}:50070 {datanode}:50075 {hive_metastore_postgresql}:5432" \
-                                .format(
-                                namenode=namenode.name,
-                                datanode=datanode.name,
-                                hive_metastore_postgresql=hive_metastore_postgresql.name
-                            )
-                        ] + environment_file_lines,
-            ports={"9083/tcp": "9083"},
-            command="/opt/hive/bin/hive --service metastore"
-        )
-        return hive_metastore
-
-    def start_hive_metastore_postgresql(self, env):
-        hive_metastore_postgresql = env.run(
-            name="hive-metastore-postgresql",
-            image="bde2020/hive-metastore-postgresql:2.3.0",
-        )
-        return hive_metastore_postgresql
-
-    def copy_hive_sql_to_hive_server(self, hive_server, resource_dir):
-        file_like_object = BytesIO()
-        tar = tarfile.open(fileobj=file_like_object, mode="w")
-        tar.add(resource_dir + "/retail.sql", "/hive_resources/retail.sql")
-        tar.close()
-        hive_server.put_archive("/opt/", file_like_object.getvalue())
-
-    def setup_hive_schema(self, hive_server, resource_dir):
-        self.copy_hive_sql_to_hive_server(hive_server, resource_dir)
-        exit_code, output = hive_server.exec_run(cmd="bash -c 'hive -f /opt/hive_resources/retail.sql'")
-        if exit_code != 0:
-            self.fail("bash -c 'hive -f /opt/hive_resources/retail.sql' failed, %s" % output)
-
-    def add_containers_to_hosts_file_in_docker_db(self, env):
-        docker_db_container = env.get_docker_db_container()
-        delete_command_template = "sed -i '/^.* {container_name}$/d' /etc/hosts"
-        append_command_template = "echo '{container_ip} {container_name}' >> /etc/hosts"
-        command_template = """bash -c "{delete_command}; {append_command}" """.format(
-            delete_command=delete_command_template,
-            append_command=append_command_template)
-        for started_container in env.list_started_containers():
-            container_ip = env.get_ip_address_of_container(started_container)
-            command = command_template.format(
-                container_ip=container_ip,
-                container_name=started_container.name)
-            exit_code, output = docker_db_container.exec_run(cmd=command)
-            if exit_code != 0:
-                raise Exception(output)
-
-    def upload_hadoop_etl_udf_jar_to_bucket_fs(self, env):
-        env_info = obj_from_json_file("/environment_info.json")
-        docker_db_ip = env_info.database_info.container_info.ip_address
-        bucketfs_port = env_info.database_info.ports._bucketfs_http
-        upload_url = f"http://{docker_db_ip}:{bucketfs_port}/myudfs/hadoop-etl-udfs-v0.0.1-apache-2.8.5-3.0.0.jar".format(
-            docker_db_ip=docker_db_ip)
-        username = "w"
-        password = "write"  # TOOD hardcoded
-        import requests
-        from requests.auth import HTTPBasicAuth
-        download_url = "https://storage.googleapis.com/exasol-script-languages-extras/hadoop-etl-udfs-v1.0.0-apache-hadoop-2.8.5-hive-2.3.7.jar"
-        #        download_url="https://storage.googleapis.com/exasol-script-languages-extras/hadoop-etl-udfs-v0.0.1-apache-2.8.5-3.0.0.jar" # this jar causes https://github.com/exasol/hadoop-etl-udfs/issues/52
-        r_download = requests.get(download_url, stream=True)
-        r_upload = requests.put(upload_url, data=r_download.iter_content(10 * 1024),
-                                auth=HTTPBasicAuth(username, password))
-        r_download.raise_for_status()
-        r_upload.raise_for_status()
-
-    def create_hadoop_etl_udfs(self):
-        self.query(udf.fixindent("""
-                CREATE OR REPLACE JAVA SET SCRIPT IMPORT_HCAT_TABLE(...) EMITS (...) AS
-                %jvmoption -verbose:jni;
-                %scriptclass com.exasol.hadoop.scriptclasses.ImportHCatTable;
-                %jar /buckets/bfsdefault/myudfs/hadoop-etl-udfs-v0.0.1-apache-2.8.5-3.0.0.jar;
-                /
-                """))
-        self.query(udf.fixindent("""
-                CREATE OR REPLACE JAVA SET SCRIPT IMPORT_HIVE_TABLE_FILES(...) EMITS (...) AS
-                %env LD_LIBRARY_PATH=/tmp/;
-                %jvmoption -verbose:jni;
-                %scriptclass com.exasol.hadoop.scriptclasses.ImportHiveTableFiles;
-                %jar /buckets/bfsdefault/myudfs/hadoop-etl-udfs-v0.0.1-apache-2.8.5-3.0.0.jar;
-                /
-                """))
-
-        self.query(udf.fixindent("""
-                CREATE OR REPLACE JAVA SCALAR SCRIPT HCAT_TABLE_FILES(...) EMITS (
-                  hdfs_server_port VARCHAR(200),
-                  hdfspath VARCHAR(200),
-                  hdfs_user_or_service_principal VARCHAR(100),
-                  hcat_user_or_service_principal VARCHAR(100),
-                  input_format VARCHAR(200),
-                  serde VARCHAR(200),
-                  column_info VARCHAR(100000),
-                  partition_info VARCHAR(10000),
-                  serde_props VARCHAR(10000),
-                  import_partition INT,
-                  auth_type VARCHAR(1000),
-                  conn_name VARCHAR(1000),
-                  output_columns VARCHAR(100000),
-                  enable_rpc_encryption VARCHAR(100),
-                  debug_address VARCHAR(200))
-                AS
-                %jvmoption -verbose:jni;
-                %scriptclass com.exasol.hadoop.scriptclasses.HCatTableFiles;
-                %jar /buckets/bfsdefault/myudfs/hadoop-etl-udfs-v0.0.1-apache-2.8.5-3.0.0.jar;
-                /
-                """))
-
-    @udf.skipIfNot(docker_db_environment.is_available, reason="This test requires a docker-db environment")
-    def test_java_hive(self):
-        env = docker_db_environment.DockerDBEnvironment("JAVA_HIVE")
-
-        try:
-            docker_user = os.getenv("DOCKER_USERNAME")
-            docker_password = os.getenv("DOCKER_PASSWORD")
-            if docker_user is not None and docker_password is not None:
-                env.get_client().login(username=docker_user, password=docker_password)
-            #        env.get_client().images.pull("bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8")
-            #        env.get_client().images.pull("bde2020/hadoop-datanode:2.0.0-hadoop2.7.4-java8")
-            #        env.get_client().images.pull("bde2020/hive:2.3.2-postgresql-metastore")
-            #        env.get_client().images.pull("bde2020/hive-metastore-postgresql:2.3.0")
-            script_dir = os.path.dirname(os.path.realpath(__file__))
-            resource_dir = script_dir + "/resources/hadoop_etl_udf"
-
-            environment_file_lines = self.fill_hadoop_hive_env_template(resource_dir, env)
-
-            namenode = self.start_namenode(env, environment_file_lines)
-            datanode = self.start_datanode(env, environment_file_lines, namenode)
-            hive_metastore_postgresql = self.start_hive_metastore_postgresql(env)
-            hive_metastore = self.start_hive_metastore(env, environment_file_lines, namenode, datanode,
-                                                       hive_metastore_postgresql)
-            hive_server = self.start_hive_server(env, environment_file_lines, hive_metastore)
-
-            time.sleep(60)  # TODO proper wait strategy for hive
-
-            self.setup_hive_schema(hive_server, resource_dir)
-            self.add_containers_to_hosts_file_in_docker_db(env)
-            self.upload_hadoop_etl_udf_jar_to_bucket_fs(env)
-            self.create_hadoop_etl_udfs()
-
-            self.query("""
-                CREATE OR REPLACE TABLE SALES_POSITIONS (
-                  SALES_ID    INTEGER,
-                  POSITION_ID SMALLINT,
-                  ARTICLE_ID  SMALLINT,
-                  AMOUNT      SMALLINT,
-                  PRICE       DECIMAL(9,2),
-                  VOUCHER_ID  SMALLINT,
-                  CANCELED    BOOLEAN
-                );
-                """)
-
-            with UdfDebugger(test_case=self):
-                try:
-                    self.query("""
-                        IMPORT INTO SALES_POSITIONS
-                        FROM SCRIPT IMPORT_HCAT_TABLE WITH
-                          HCAT_DB         = 'retail'
-                          HCAT_TABLE      = 'sales_positions'
-                          HCAT_ADDRESS    = 'thrift://%s:9083'
-                          HCAT_USER       = 'hive'
-                          HDFS_USER       = 'hdfs'
-                          PARALLELISM     = 'nproc()';
-                        """ % hive_metastore.name)
-                finally:
-                    print("namenode")
-                    print(namenode.logs())
-                    print("datanode")
-                    print(datanode.logs())
-                    print("hive_metastore_postgresql")
-                    print(hive_metastore_postgresql.logs())
-                    print("hive_metastore")
-                    print(hive_metastore.logs())
-                    print(hive_server)
-                    print(hive_server.logs())
-                    time.sleep(10)
-        finally:
-            del env
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/java/timezone.py b/test_container/tests/test/java/timezone.py
deleted file mode 100644
index 95f3206..0000000
--- a/test_container/tests/test/java/timezone.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# !/usr/bin/env python3
-
-from exasol_python_test_framework import udf
-from exasol_python_test_framework.udf import requires
-
-
-class TimeZoneTest(udf.TestCase):
-
-    def setUp(self):
-        self.query('DROP SCHEMA tz_java CASCADE', ignore_errors=True)
-        self.query('CREATE SCHEMA tz_java')
-
-    def test_default(self):
-        rows = self.query('''
-                          SELECT DBTIMEZONE
-                          FROM DUAL
-                          ''')
-        self.assertRowsEqual([("EUROPE/BERLIN",)], rows)
-        self.query(udf.fixindent('''
-        CREATE OR REPLACE java SCALAR SCRIPT
-        default_tz()
-        RETURNS VARCHAR(100) AS
-        import java.time.ZoneId;
-        import java.util.TimeZone;
-
-        class DEFAULT_TZ{
-            static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                TimeZone timeZone = TimeZone.getDefault();
-                return timeZone.getDisplayName(false, TimeZone.SHORT);
-
-            }
-        }
-        /
-        '''))
-        rows = self.query('''
-                          SELECT tz_java.default_tz()
-                          FROM DUAL
-                          ''')
-        self.assertRowsEqual([("CET",)], rows)
-
-    def test_set_tz_via_env_script_option(self):
-        self.query(udf.fixindent('''
-
-        CREATE OR REPLACE java SCALAR SCRIPT
-        modify_tz_to_est()
-        RETURNS VARCHAR(100) AS
-        %env TZ=America/New_York;
-        import java.time.ZoneId;
-        import java.util.TimeZone;
-        class MODIFY_TZ_TO_EST{
-            static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                TimeZone timeZone = TimeZone.getDefault();
-                return timeZone.getDisplayName(false, TimeZone.SHORT);
-            }
-        }
-        /
-        '''))
-        rows = self.query('''
-                          SELECT tz_java.modify_tz_to_est()
-                          FROM DUAL
-                          ''')
-        self.assertRowsEqual([("EST",)], rows)
-
-    def test_set_tz_via_jvm_option_script_option(self):
-        self.query(udf.fixindent('''
-
-        CREATE OR REPLACE java SCALAR SCRIPT
-        modify_tz_to_est_via_jvm_option()
-        RETURNS VARCHAR(100) AS
-        %jvmoption -Duser.timezone=America/New_York;
-        import java.time.ZoneId;
-        import java.util.TimeZone;
-        class MODIFY_TZ_TO_EST_VIA_JVM_OPTION {
-            static String run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                TimeZone timeZone = TimeZone.getDefault();
-                return timeZone.getDisplayName(false, TimeZone.SHORT);
-            }
-        }
-        /
-        '''))
-        rows = self.query('''
-                          SELECT tz_java.modify_tz_to_est_via_jvm_option()
-                          FROM DUAL
-                          ''')
-        self.assertRowsEqual([("EST",)], rows)
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/java/unicode.py b/test_container/tests/test/java/unicode.py
deleted file mode 100755
index 3d0c046..0000000
--- a/test_container/tests/test/java/unicode.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python3
-# encoding: utf8
-
-import locale
-import os
-import string
-import subprocess
-
-from exasol_python_test_framework import udf
-
-locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
-
-
-class JavaUnicode(udf.TestCase):
-    def test_unicode_umlaute(self):
-        cmd = '''%(exaplus)s -c %(conn)s -u sys -P exasol
-		-no-config -autocommit ON -L -pipe -jdbcparam validateservercertificate=0''' % {
-			'exaplus': os.environ.get('EXAPLUS',
-				'/usr/opt/EXASuite-5/EXASolution-5.0.rc1/bin/Console/exaplus'),
-			'conn': udf.opts.server
-			}
-        env = os.environ.copy()
-        env['PATH'] = '/usr/opt/jdk1.8.0_latest/bin:' + env['PATH']
-        env['LC_ALL'] = 'en_US.UTF-8'
-        exaplus = subprocess.Popen(cmd.split(), env=env, stdin=subprocess.PIPE, stdout=subprocess.PIPE, 
-                                stderr=subprocess.STDOUT)
-
-        u = 'äöüß' + chr(382) + chr(65279) + chr(63882) + chr(64432)
-        umlaute = 'äöüß'
-
-        sql = udf.fixindent('''
-            DROP SCHEMA fn1 CASCADE;
-            CREATE SCHEMA fn1;
-            CREATE OR REPLACE java SCALAR SCRIPT
-            unicode_in_script_body()
-            RETURNS INTEGER AS
-            class UNICODE_IN_SCRIPT_BODY {
-                static int run(ExaMetadata exa, ExaIterator ctx) {
-                    String letters = "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-                    letters = letters.concat("%s");
-                    int[] codePoints = {382, 65279, 63882, 64432};
-                    letters = letters.concat(new String(codePoints, 0, codePoints.length));
-                    return letters.codePointCount(0, letters.length());
-                }
-            }
-            /
-            SELECT 'x' || fn1.unicode_in_script_body() || 'x' FROM DUAL;
-        ''' % umlaute)
-        out, _err = exaplus.communicate(sql.encode('utf8'))
-        expected = 'x%dx' % (len(string.ascii_letters) + len(u))
-        self.assertIn(expected, out.decode('utf-8'))
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/performance/abstract_performance_test.py b/test_container/tests/test/performance/abstract_performance_test.py
index 2fe1e63..d6d869d 100644
--- a/test_container/tests/test/performance/abstract_performance_test.py
+++ b/test_container/tests/test/performance/abstract_performance_test.py
@@ -56,7 +56,7 @@ def run_test(self, runs, warmup, max_deviation, query):
         connection.close()
 
         connection = self.getConnection(self.user,self.password)
-        connection.query("ALTER SESSION SET script_languages='PYTHON3=builtin_python3 JAVA=builtin_java R=builtin_r'")
+        connection.query("ALTER SESSION SET script_languages='PYTHON3=builtin_python3 R=builtin_r'")
         builtin_mean_elapsed_time,builtin_variance_elapsed_time,\
         builtin_max_elapsed_time,builtin_min_elapsed_time=\
                 self.run_queries(connection,"builtin", runs, warmup, query)
diff --git a/test_container/tests/test/performance/java_scalar_emit_consume_columns.py b/test_container/tests/test/performance/java_scalar_emit_consume_columns.py
deleted file mode 100644
index 0b20420..0000000
--- a/test_container/tests/test/performance/java_scalar_emit_consume_columns.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env python3
-# encoding: utf8
-
-from exasol_python_test_framework import udf
-from abstract_performance_test import AbstractPerformanceTest
-
-
-class ScalarEmitConsumeNextOnlyJavaPerformanceTest(AbstractPerformanceTest):
-
-    def setUp(self):
-        self.create_schema()
-        self.generate_data_linear(500)
-        self.query(udf.fixindent('''
-                CREATE JAVA SCALAR SCRIPT CONSUME_NEXT(
-                    intVal DECIMAL(9,0), 
-                    longVal DECIMAL(18,0), 
-                    bigdecimalVal DECIMAL(36,0), 
-                    decimalVal DECIMAL(9,2),
-                    doubleVal DOUBLE, 
-                    doubleIntVal DOUBLE, 
-                    stringVal VARCHAR(100), 
-                    booleanVal BOOLEAN, 
-                    dateVal DATE, 
-                    timestampVal TIMESTAMP) EMITS (count_value INT) AS
-                import java.math.BigDecimal;
-                class CONSUME_NEXT {
-                    static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        Integer intVal = ctx.getInteger(0);
-                        Long longVal = ctx.getLong(1);
-                        BigDecimal bigdecimalVal = ctx.getBigDecimal(2);
-                        BigDecimal decimalVal = ctx.getBigDecimal(3);
-                        Double doubleVal = ctx.getDouble(4);
-                        Double doubleIntVal = ctx.getDouble(5);
-                        String stringVal = ctx.getString(6);
-                        Boolean booleanVal = ctx.getBoolean(7);
-                        java.sql.Date dateVal = ctx.getDate(8);
-                        java.sql.Timestamp timestampVal = ctx.getTimestamp(9);
-                    }
-                }
-                '''))
-        self.query("commit")
-    
-    def tearDown(self):
-        self.cleanup(self.schema)
-
-    def test_consume_next(self):
-        self.run_test(15, 3, 2.0, "SELECT CONSUME_NEXT(intVal,longVal,bigdecimalVal,decimalVal,doubleVal,doubleIntVal,"
-                                  "stringVal,booleanVal,dateVal,timestampVal) FROM T")
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/performance/java_scalar_emit_consume_next_only.py b/test_container/tests/test/performance/java_scalar_emit_consume_next_only.py
deleted file mode 100644
index c7ea254..0000000
--- a/test_container/tests/test/performance/java_scalar_emit_consume_next_only.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env python3
-# encoding: utf8
-
-from exasol_python_test_framework import udf
-from abstract_performance_test import AbstractPerformanceTest
-
-
-class ScalarEmitConsumeNextOnlyJavaPerformanceTest(AbstractPerformanceTest):
-
-    def setUp(self):
-        self.create_schema()
-        self.generate_data_linear(500)
-        self.query(udf.fixindent('''
-                CREATE JAVA SCALAR SCRIPT CONSUME_NEXT(
-                    intVal DECIMAL(9,0), 
-                    longVal DECIMAL(18,0), 
-                    bigdecimalVal DECIMAL(36,0), 
-                    decimalVal DECIMAL(9,2),
-                    doubleVal DOUBLE, 
-                    doubleIntVal DOUBLE, 
-                    stringVal VARCHAR(100), 
-                    booleanVal BOOLEAN, 
-                    dateVal DATE, 
-                    timestampVal TIMESTAMP) EMITS (count_value INT) AS
-                class CONSUME_NEXT {
-                    static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    }
-                }
-                '''))
-        self.query("commit")
-    
-    def tearDown(self):
-        self.cleanup(self.schema)
-
-    def test_consume_next(self):
-        self.run_test(15, 3, 2.0, "SELECT CONSUME_NEXT(intVal,longVal,bigdecimalVal,decimalVal,doubleVal,doubleIntVal,"
-                                  "stringVal,booleanVal,dateVal,timestampVal) FROM T")
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/performance/java_set_emit_consume_columns.py b/test_container/tests/test/performance/java_set_emit_consume_columns.py
deleted file mode 100644
index 411d9dd..0000000
--- a/test_container/tests/test/performance/java_set_emit_consume_columns.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env python3
-# encoding: utf8
-
-from exasol_python_test_framework import udf
-from abstract_performance_test import AbstractPerformanceTest
-
-
-class SetEmitConsumeNextOnlyJavaPerformanceTest(AbstractPerformanceTest):
-
-    def setUp(self):
-        self.create_schema()
-        self.generate_data_linear(500)
-        self.query(udf.fixindent('''
-                CREATE JAVA SET SCRIPT CONSUME_NEXT(
-                    intVal DECIMAL(9,0), 
-                    longVal DECIMAL(18,0), 
-                    bigdecimalVal DECIMAL(36,0), 
-                    decimalVal DECIMAL(9,2),
-                    doubleVal DOUBLE, 
-                    doubleIntVal DOUBLE, 
-                    stringVal VARCHAR(100), 
-                    booleanVal BOOLEAN, 
-                    dateVal DATE, 
-                    timestampVal TIMESTAMP) EMITS (count_value INT) AS
-                import java.math.BigDecimal;
-                class CONSUME_NEXT {
-                    static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        int count=0;
-                        while(ctx.next()){
-                            Integer intVal = ctx.getInteger(0);
-                            Long longVal = ctx.getLong(1);
-                            BigDecimal bigdecimalVal = ctx.getBigDecimal(2);
-                            BigDecimal decimalVal = ctx.getBigDecimal(3);
-                            Double doubleVal = ctx.getDouble(4);
-                            Double doubleIntVal = ctx.getDouble(5);
-                            String stringVal = ctx.getString(6);
-                            Boolean booleanVal = ctx.getBoolean(7);
-                            java.sql.Date dateVal = ctx.getDate(8);
-                            java.sql.Timestamp timestampVal = ctx.getTimestamp(9);
-                            count=count+1;
-                        }
-                    }
-                }
-                '''))
-        self.query("commit")
-    
-    def tearDown(self):
-        self.cleanup(self.schema)
-
-    def test_consume_next(self):
-        self.run_test(15, 3, 2.0, "SELECT CONSUME_NEXT(intVal,longVal,bigdecimalVal,decimalVal,doubleVal,doubleIntVal,"
-                                  "stringVal,booleanVal,dateVal,timestampVal) FROM T")
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/performance/java_set_emit_consume_next_only.py b/test_container/tests/test/performance/java_set_emit_consume_next_only.py
deleted file mode 100644
index 3fbdf9a..0000000
--- a/test_container/tests/test/performance/java_set_emit_consume_next_only.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env python3
-# encoding: utf8
-
-from exasol_python_test_framework import udf
-from abstract_performance_test import AbstractPerformanceTest
-
-
-class SetEmitConsumeNextOnlyJavaPerformanceTest(AbstractPerformanceTest):
-
-    def setUp(self):
-        self.create_schema()
-        self.generate_data_linear(500)
-        self.query(udf.fixindent('''
-                CREATE JAVA SET SCRIPT CONSUME_NEXT(
-                    intVal DECIMAL(9,0), 
-                    longVal DECIMAL(18,0), 
-                    bigdecimalVal DECIMAL(36,0), 
-                    decimalVal DECIMAL(9,2),
-                    doubleVal DOUBLE, 
-                    doubleIntVal DOUBLE, 
-                    stringVal VARCHAR(100), 
-                    booleanVal BOOLEAN, 
-                    dateVal DATE, 
-                    timestampVal TIMESTAMP) EMITS (count_value INT) AS
-                class CONSUME_NEXT {
-                    static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        int count=0;
-                        while(ctx.next()){
-                            count=count+1;
-                        }
-                    }
-                }
-                '''))
-        self.query("commit")
-    
-    def tearDown(self):
-        self.cleanup(self.schema)
-
-    def test_consume_next(self):
-        self.run_test(15, 3, 2.0, "SELECT CONSUME_NEXT(intVal,longVal,bigdecimalVal,decimalVal,doubleVal,doubleIntVal,"
-                                  "stringVal,booleanVal,dateVal,timestampVal) FROM T")
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/performance/java_set_emit_output_only.py b/test_container/tests/test/performance/java_set_emit_output_only.py
deleted file mode 100644
index e187155..0000000
--- a/test_container/tests/test/performance/java_set_emit_output_only.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env python3
-# encoding: utf8
-
-from exasol_python_test_framework import udf
-from abstract_performance_test import AbstractPerformanceTest
-
-
-class SetEmitOutputOnlyPythonPerformanceTest(AbstractPerformanceTest):
-
-    def setUp(self):
-        self.create_schema()
-        self.query(udf.fixindent('''
-                CREATE JAVA SET SCRIPT OUTPUT_ONLY(input_value INT)
-                    EMITS (
-                    intVal DECIMAL(9,0), 
-                    longVal DECIMAL(18,0), 
-                    bigdecimalVal DECIMAL(36,0), 
-                    decimalVal DECIMAL(9,2),
-                    doubleVal DOUBLE, 
-                    doubleIntVal DOUBLE, 
-                    stringVal VARCHAR(100), 
-                    booleanVal BOOLEAN) AS
-                class OUTPUT_ONLY {
-                    static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        Integer input_value=ctx.getInteger(0);
-                        for(int i = 0; i<input_value;i++){
-                            ctx.emit(i,i,i,i,i,i,String.valueOf(i),true);
-                        }
-                    }
-                }
-
-                '''))
-        self.query("commit")
-    
-    def tearDown(self):
-        self.cleanup(self.schema)
-
-    def test_consume_next(self):
-        self.run_test(15, 3, 2.0, "SELECT count(*) FROM (SELECT OUTPUT_ONLY(300000)) as q")
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/performance/java_set_emit_start_only.py b/test_container/tests/test/performance/java_set_emit_start_only.py
deleted file mode 100644
index d500466..0000000
--- a/test_container/tests/test/performance/java_set_emit_start_only.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env python3
-# encoding: utf8
-
-import os
-import sys
-
-from exasol_python_test_framework import udf
-from abstract_performance_test import AbstractPerformanceTest
-
-
-class SetEmitStartOnlyJavaPerformanceTest(AbstractPerformanceTest):
-
-    def setUp(self):
-        self.create_schema()
-        self.query(udf.fixindent('''
-                CREATE JAVA SET SCRIPT START_ONLY(
-                    intVal INT) EMITS (count_value INT) AS
-                class START_ONLY {
-                    static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                    }
-                }
-                '''))
-        self.query("commit")
-    
-    def tearDown(self):
-        self.cleanup(self.schema)
-
-    def test_consume_next(self):
-        self.run_test(1000, 3, 2.0, "SELECT START_ONLY(1) FROM DUAL;")
-
-
-if __name__ == '__main__':
-    udf.main()
diff --git a/test_container/tests/test/performance/very_large/java_scalar_emit_consume_emit_very_large.py b/test_container/tests/test/performance/very_large/java_scalar_emit_consume_emit_very_large.py
deleted file mode 100644
index b1eccc9..0000000
--- a/test_container/tests/test/performance/very_large/java_scalar_emit_consume_emit_very_large.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python3
-# encoding: utf8
-
-from exasol_python_test_framework import udf
-from ..abstract_performance_test import AbstractPerformanceTest
-
-
-class ScalarEmitConsumeNextOnlyJavaPerformanceTest(AbstractPerformanceTest):
-
-    def setUp(self):
-        self.create_schema()
-        self.generate_data_exponential(4)
-        self.query(udf.fixindent('''
-                CREATE JAVA SCALAR SCRIPT CONSUME_NEXT(
-                        intVal DECIMAL(9,0), 
-                        longVal DECIMAL(18,0), 
-                        bigdecimalVal DECIMAL(36,0), 
-                        decimalVal DECIMAL(9,2),
-                        doubleVal DOUBLE, 
-                        doubleIntVal DOUBLE, 
-                        stringVal VARCHAR(100), 
-                        booleanVal BOOLEAN, 
-                        dateVal DATE, 
-                        timestampVal TIMESTAMP
-                    ) EMITS (
-                        intVal DECIMAL(9,0), 
-                        longVal DECIMAL(18,0), 
-                        bigdecimalVal DECIMAL(36,0), 
-                        decimalVal DECIMAL(9,2),
-                        doubleVal DOUBLE, 
-                        doubleIntVal DOUBLE, 
-                        stringVal VARCHAR(100), 
-                        booleanVal BOOLEAN, 
-                        dateVal DATE, 
-                        timestampVal TIMESTAMP
-                    ) AS
-                import java.math.BigDecimal;
-                class CONSUME_NEXT {
-                    static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                        Integer intVal = ctx.getInteger(0);
-                        Long longVal = ctx.getLong(1);
-                        BigDecimal bigdecimalVal = ctx.getBigDecimal(2);
-                        BigDecimal decimalVal = ctx.getBigDecimal(3);
-                        Double doubleVal = ctx.getDouble(4);
-                        Double doubleIntVal = ctx.getDouble(5);
-                        String stringVal = ctx.getString(6);
-                        Boolean booleanVal = ctx.getBoolean(7);
-                        java.sql.Date dateVal = ctx.getDate(8);
-                        java.sql.Timestamp timestampVal = ctx.getTimestamp(9);
-                        ctx.emit(intVal,longVal,bigdecimalVal,decimalVal,doubleVal,doubleIntVal,stringVal,booleanVal,dateVal,timestampVal);
-                    }
-                }
-                '''))
-        self.query("commit")
-    
-    def tearDown(self):
-        self.cleanup(self.schema)
-
-    def test_consume_next(self):
-        self.run_test(1, 0, 2.0, "SELECT count(*) from (SELECT CONSUME_NEXT(intVal,longVal,bigdecimalVal,decimalVal,"
-                                 "doubleVal,doubleIntVal,stringVal,booleanVal,dateVal,timestampVal) FROM T) as q")
-
-
-if __name__ == '__main__':
-    udf.main()

From 8b7fb2555d054a16d4bfe8fdeafb0bcc3e01dfcb Mon Sep 17 00:00:00 2001
From: "Shankar.KV" <shankar.vaithiyanadhaswamy@exasol.com>
Date: Thu, 27 Aug 2026 19:01:22 +0530
Subject: [PATCH 3/8] Remove java VM from cpp files

---
 .../base/exaudflib/swig/swig_common.h         |  1 -
 .../exa_udf_client.cc                         | 29 ++-----------------
 .../exa_udf_client.h                          |  3 +-
 .../exa_vm_factory.cc                         | 19 ++----------
 .../exa_vm_factory.h                          |  2 +-
 5 files changed, 7 insertions(+), 47 deletions(-)

diff --git a/exaudfclient/base/exaudflib/swig/swig_common.h b/exaudfclient/base/exaudflib/swig/swig_common.h
index 8080e59..b61b0fc 100644
--- a/exaudfclient/base/exaudflib/swig/swig_common.h
+++ b/exaudfclient/base/exaudflib/swig/swig_common.h
@@ -15,7 +15,6 @@ enum VMTYPE {
     VM_JAVASCRIPT = 3,
     VM_R = 4,
     VM_EXTERNAL = 5,
-    VM_JAVA = 6,
     VM_PLUGIN_LANGUAGE = 7,
     VM_BENCHMARK = 8
 };
diff --git a/exaudfclient/exa_udfclient_binary_common/exa_udf_client.cc b/exaudfclient/exa_udfclient_binary_common/exa_udf_client.cc
index 04dc00a..38e53bd 100644
--- a/exaudfclient/exa_udfclient_binary_common/exa_udf_client.cc
+++ b/exaudfclient/exa_udfclient_binary_common/exa_udf_client.cc
@@ -8,38 +8,15 @@ void ExaUdfClient::parse_arguments(int argc, char** argv) {
     //  Now assumption is that all cmd line aguments are already validated.
     m_languageArg = argv[2];
    
-    m_useCtpgParser = false;
-    
-    /*
-     * The given script-options-parser version set by the environment variable "SCRIPT_OPTIONS_PARSER_VERSION"
-     * must have priority over the CLI argument "scriptOptionsParserVersion=x".
-     * This allows clients to override the parser version in a specific UDF, if needed,
-     * via "%env SCRIPT_OPTIONS_PARSER_VERSION=x".
-     */
-    const char* env_val = ::getenv("SCRIPT_OPTIONS_PARSER_VERSION");
-    if(env_val && strcmp(env_val, "2") == 0) {
-        m_useCtpgParser = true;
-    } else if(argc == 4) {
-        std::string parse_option(argv[3]);
-        m_useCtpgParser =  (parse_option.compare("scriptOptionsParserVersion=2") == 0);
-    }
 }
 
 bool ExaUdfClient::validate_arguments(int argc, char** argv) {
-    if (argc < 3 || argc > 4) {
-        usage(argv[0]);
-        return false;
-    }
-
-    if (argc == 4 && 
-        strcmp(argv[3], "scriptOptionsParserVersion=1") != 0 &&
-        strcmp(argv[3], "scriptOptionsParserVersion=2") != 0) {
+    if (argc != 3) {
         usage(argv[0]);
         return false;
     }
 
     if (!((strcmp(argv[2], "lang=python") == 0)
-        || (strcmp(argv[2], "lang=java") == 0)
         || (strcmp(argv[2], "lang=streaming") == 0)
         || (strcmp(argv[2], "lang=benchmark") == 0))) {
         usage(argv[0]);
@@ -51,10 +28,10 @@ bool ExaUdfClient::validate_arguments(int argc, char** argv) {
 
 void ExaUdfClient::usage(const std::string& programName) {
     std::cerr << "Usage: " << programName
-              << " <socket> lang=python|lang=java|lang=streaming|lang=benchmark <scriptOptionsParserVersion=1|2>"
+              << " <socket> lang=python|lang=streaming|lang=benchmark"
               << std::endl;
 }
 
 std::function<SWIGVMContainers::SWIGVM*()> ExaUdfClient::create_vm() {
-    return ::create_vm(m_languageArg, m_useCtpgParser);
+    return ::create_vm(m_languageArg);
 }
diff --git a/exaudfclient/exa_udfclient_binary_common/exa_udf_client.h b/exaudfclient/exa_udfclient_binary_common/exa_udf_client.h
index 83c29cb..062c3f5 100644
--- a/exaudfclient/exa_udfclient_binary_common/exa_udf_client.h
+++ b/exaudfclient/exa_udfclient_binary_common/exa_udf_client.h
@@ -14,5 +14,4 @@ class ExaUdfClient : public ExaUdfClientBase {
     
 protected:
     std::string m_languageArg;
-    bool m_useCtpgParser = false;
-};
\ No newline at end of file
+};
diff --git a/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.cc b/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.cc
index c288ff3..eb40110 100644
--- a/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.cc
+++ b/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.cc
@@ -2,10 +2,6 @@
 #include <iostream>
 #include "exa_vm_factory.h"
 
-#ifdef ENABLE_JAVA_VM
-#include "javacontainer/javacontainer_builder.h"
-#endif //ENABLE_JAVA_VM
-
 #ifdef ENABLE_PYTHON_VM
 #include "python/pythoncontainer.h"
 #endif //ENABLE_PYTHON_VM
@@ -18,7 +14,7 @@
 #include "benchmark_container/benchmark_container.h"
 #endif
 
-std::function<SWIGVMContainers::SWIGVM*()> create_vm(const std::string& argv_lang, bool use_ctpg_options_parser) {
+std::function<SWIGVMContainers::SWIGVM*()> create_vm(const std::string& argv_lang) {
     if(argv_lang.compare("lang=python") == 0) {
         #ifdef ENABLE_PYTHON_VM
             char *path_var = getenv("PATH");
@@ -34,17 +30,6 @@ std::function<SWIGVMContainers::SWIGVM*()> create_vm(const std::string& argv_lan
             throw SWIGVMContainers::SWIGVM::exception("this exaudfclient has been compilied without Python support");
         #endif
     }
-    else if(argv_lang.compare("lang=java") == 0) {
-        #ifdef ENABLE_JAVA_VM
-            if (use_ctpg_options_parser) {
-                return [&](){return SWIGVMContainers::JavaContainerBuilder().useCtpgParser().build();};
-            } else {
-                return [&](){return SWIGVMContainers::JavaContainerBuilder().build();};
-            }
-        #else
-            throw SWIGVMContainers::SWIGVM::exception("this exaudfclient has been compilied without Java support");
-        #endif
-    }
     else if(argv_lang.compare("lang=streaming") == 0) {
         #ifdef ENABLE_STREAMING_VM
             return []() { return new SWIGVMContainers::StreamingVM(false); };
@@ -62,4 +47,4 @@ std::function<SWIGVMContainers::SWIGVM*()> create_vm(const std::string& argv_lan
     else {
         throw SWIGVMContainers::SWIGVM::exception("unsupported language specified in argv");
     }   
-}
\ No newline at end of file
+}
diff --git a/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.h b/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.h
index d9314a5..750abc4 100644
--- a/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.h
+++ b/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.h
@@ -1,4 +1,4 @@
 #pragma once
 #include "exaudflib/vm/swig_vm.h"
 
-std::function<SWIGVMContainers::SWIGVM*()> create_vm(const std::string& argv_lang, bool use_ctpg_options_parser);
\ No newline at end of file
+std::function<SWIGVMContainers::SWIGVM*()> create_vm(const std::string& argv_lang);

From 43aabda0d437fa9f5a88ad5bfd63a5a359a8fb7b Mon Sep 17 00:00:00 2001
From: "Shankar.KV" <shankar.vaithiyanadhaswamy@exasol.com>
Date: Thu, 27 Aug 2026 19:02:46 +0530
Subject: [PATCH 4/8] Remove the java VM implementation

---
 exaudfclient/base/filter_swig_code.py         |  133 -
 exaudfclient/base/java_repository.bzl         |   54 -
 exaudfclient/base/javacontainer/BUILD         |  153 -
 .../base/javacontainer/ExaCompiler.java       |   55 -
 .../ExaConnectionInformationImpl.java         |   35 -
 .../ExaExportSpecificationImpl.java           |   82 -
 .../ExaImportSpecificationImpl.java           |   68 -
 .../base/javacontainer/ExaIteratorImpl.java   |  679 ----
 .../base/javacontainer/ExaMetadataImpl.java   |  305 --
 .../javacontainer/ExaStackTraceCleaner.java   |   93 -
 .../ExaUndefinedSingleCallException.java      |   16 -
 .../base/javacontainer/ExaWrapper.java        |  273 --
 .../javacontainer/exascript_java_jni_decl.h   |  261 --
 .../base/javacontainer/javacontainer.cc       |   57 -
 .../base/javacontainer/javacontainer.h        |   41 -
 .../javacontainer/javacontainer_builder.cc    |   31 -
 .../javacontainer/javacontainer_builder.h     |   35 -
 .../base/javacontainer/javacontainer_impl.cc  |  454 ---
 .../base/javacontainer/javacontainer_impl.h   |   64 -
 .../base/javacontainer/script_options/BUILD   |   19 -
 .../javacontainer/script_options/converter.cc |   25 -
 .../javacontainer/script_options/converter.h  |   49 -
 .../script_options/converter_legacy.cc        |   42 -
 .../script_options/converter_legacy.h         |   46 -
 .../script_options/converter_v2.cc            |   37 -
 .../script_options/converter_v2.h             |   45 -
 .../script_options/distinct_script_set.cc     |   17 -
 .../script_options/distinct_script_set.h      |   29 -
 .../javacontainer/script_options/extractor.h  |   53 -
 .../script_options/extractor_impl.cc          |   54 -
 .../script_options/extractor_impl.h           |   48 -
 .../javacontainer/script_options/keywords.cc  |   33 -
 .../javacontainer/script_options/keywords.h   |   29 -
 .../javacontainer/script_options/parser.h     |   57 -
 .../script_options/parser_ctpg.cc             |  162 -
 .../script_options/parser_ctpg.h              |   54 -
 .../parser_ctpg_jvm_options_parser.cc         |   98 -
 .../parser_ctpg_jvm_options_parser.h          |   26 -
 .../parser_ctpg_script_importer.cc            |  111 -
 .../parser_ctpg_script_importer.h             |   64 -
 .../script_options/parser_legacy.cc           |  198 -
 .../script_options/parser_legacy.h            |   54 -
 .../script_options/string_ops.cc              |   79 -
 .../javacontainer/script_options/string_ops.h |   43 -
 exaudfclient/base/script_options_parser/BUILD |    8 -
 .../base/script_options_parser/ctpg/BUILD     |   11 -
 .../base/script_options_parser/ctpg/ctpg.hpp  | 3434 -----------------
 .../ctpg/script_option_lines_ctpg.cc          |  283 --
 .../ctpg/script_option_lines_ctpg.h           |   55 -
 .../base/script_options_parser/exception.h    |   17 -
 .../base/script_options_parser/legacy/BUILD   |   11 -
 .../legacy/script_option_lines.cc             |  107 -
 .../legacy/script_option_lines.h              |   26 -
 53 files changed, 8313 deletions(-)
 delete mode 100644 exaudfclient/base/filter_swig_code.py
 delete mode 100644 exaudfclient/base/java_repository.bzl
 delete mode 100644 exaudfclient/base/javacontainer/BUILD
 delete mode 100644 exaudfclient/base/javacontainer/ExaCompiler.java
 delete mode 100644 exaudfclient/base/javacontainer/ExaConnectionInformationImpl.java
 delete mode 100644 exaudfclient/base/javacontainer/ExaExportSpecificationImpl.java
 delete mode 100644 exaudfclient/base/javacontainer/ExaImportSpecificationImpl.java
 delete mode 100644 exaudfclient/base/javacontainer/ExaIteratorImpl.java
 delete mode 100644 exaudfclient/base/javacontainer/ExaMetadataImpl.java
 delete mode 100644 exaudfclient/base/javacontainer/ExaStackTraceCleaner.java
 delete mode 100644 exaudfclient/base/javacontainer/ExaUndefinedSingleCallException.java
 delete mode 100644 exaudfclient/base/javacontainer/ExaWrapper.java
 delete mode 100644 exaudfclient/base/javacontainer/exascript_java_jni_decl.h
 delete mode 100644 exaudfclient/base/javacontainer/javacontainer.cc
 delete mode 100644 exaudfclient/base/javacontainer/javacontainer.h
 delete mode 100644 exaudfclient/base/javacontainer/javacontainer_builder.cc
 delete mode 100644 exaudfclient/base/javacontainer/javacontainer_builder.h
 delete mode 100644 exaudfclient/base/javacontainer/javacontainer_impl.cc
 delete mode 100644 exaudfclient/base/javacontainer/javacontainer_impl.h
 delete mode 100644 exaudfclient/base/javacontainer/script_options/BUILD
 delete mode 100644 exaudfclient/base/javacontainer/script_options/converter.cc
 delete mode 100644 exaudfclient/base/javacontainer/script_options/converter.h
 delete mode 100644 exaudfclient/base/javacontainer/script_options/converter_legacy.cc
 delete mode 100644 exaudfclient/base/javacontainer/script_options/converter_legacy.h
 delete mode 100644 exaudfclient/base/javacontainer/script_options/converter_v2.cc
 delete mode 100644 exaudfclient/base/javacontainer/script_options/converter_v2.h
 delete mode 100644 exaudfclient/base/javacontainer/script_options/distinct_script_set.cc
 delete mode 100644 exaudfclient/base/javacontainer/script_options/distinct_script_set.h
 delete mode 100644 exaudfclient/base/javacontainer/script_options/extractor.h
 delete mode 100644 exaudfclient/base/javacontainer/script_options/extractor_impl.cc
 delete mode 100644 exaudfclient/base/javacontainer/script_options/extractor_impl.h
 delete mode 100644 exaudfclient/base/javacontainer/script_options/keywords.cc
 delete mode 100644 exaudfclient/base/javacontainer/script_options/keywords.h
 delete mode 100644 exaudfclient/base/javacontainer/script_options/parser.h
 delete mode 100644 exaudfclient/base/javacontainer/script_options/parser_ctpg.cc
 delete mode 100644 exaudfclient/base/javacontainer/script_options/parser_ctpg.h
 delete mode 100644 exaudfclient/base/javacontainer/script_options/parser_ctpg_jvm_options_parser.cc
 delete mode 100644 exaudfclient/base/javacontainer/script_options/parser_ctpg_jvm_options_parser.h
 delete mode 100644 exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.cc
 delete mode 100644 exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.h
 delete mode 100644 exaudfclient/base/javacontainer/script_options/parser_legacy.cc
 delete mode 100644 exaudfclient/base/javacontainer/script_options/parser_legacy.h
 delete mode 100644 exaudfclient/base/javacontainer/script_options/string_ops.cc
 delete mode 100644 exaudfclient/base/javacontainer/script_options/string_ops.h
 delete mode 100644 exaudfclient/base/script_options_parser/BUILD
 delete mode 100644 exaudfclient/base/script_options_parser/ctpg/BUILD
 delete mode 100644 exaudfclient/base/script_options_parser/ctpg/ctpg.hpp
 delete mode 100644 exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.cc
 delete mode 100644 exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.h
 delete mode 100644 exaudfclient/base/script_options_parser/exception.h
 delete mode 100644 exaudfclient/base/script_options_parser/legacy/BUILD
 delete mode 100644 exaudfclient/base/script_options_parser/legacy/script_option_lines.cc
 delete mode 100644 exaudfclient/base/script_options_parser/legacy/script_option_lines.h

diff --git a/exaudfclient/base/filter_swig_code.py b/exaudfclient/base/filter_swig_code.py
deleted file mode 100644
index 34f78ab..0000000
--- a/exaudfclient/base/filter_swig_code.py
+++ /dev/null
@@ -1,133 +0,0 @@
-import os
-import sys
-
-JAVA_SRC_PATH = 'java_src'
-
-
-def filter_swig_code(target, source):
-    assert len(target) == 1 and len(source) == 1
-
-    builddir = './'
-    # if 'build_dir' in env:
-    #     builddir = os.path.join( env['build_dir'], SWIGBASED_DIR )
-
-    # try:
-    #     RE
-    # except:
-    #     RE = env['CURRENTTOOLCHAIN']
-
-    target = str(target[0])
-    source = str(source[0])
-    print("filter_swig_code: reading file ", str(source))
-    output = []
-    with open(source) as rofile:
-        for line in rofile:
-            line = line.rstrip()
-            if source.endswith('_python_tmp.cc'):
-                line = line.replace('SWIG_init(void)', 'init_exascript_python(void)')
-                if line == '  PyObject *m, *d, *md;':
-                    line = '  PyObject *m, *d;'
-                elif line == '  md = d = PyModule_GetDict(m);':
-                    line = '  d = PyModule_GetDict(m);'
-                elif line == '  (void)md;':
-                    line = ''
-                elif line == '  PyDict_SetItemString(md, "__all__", public_interface);':
-                    line = '  PyDict_SetItemString(d, "__all__", public_interface);'
-            elif source.endswith('_r_tmp.cc') or source.endswith('_r_tmp.h'):
-                if line == '  const char *p = typeName;':
-                    output.append('#if 0')
-                elif line == '     p = typeName + 1;':
-                    output.append(line)
-                    line = '#endif'
-                elif line == '  delete arg1;':
-                    line = '  if (argp1 != NULL) delete arg1;'
-                elif line == '   {NULL, NULL, 0}':
-                    output.append('    {"RVM_next_block", (DL_FUNC) &RVM_next_block, 4},')
-                    output.append('    {"RVM_emit_block", (DL_FUNC) &RVM_emit_block, 2},')
-                elif line == 'SWIGINTERN R_CallMethodDef CallEntries[] = {':
-                    output.append('extern "C" SEXP RVM_next_block(SEXP dataexp);')
-                    output.append('extern "C" SEXP RVM_emit_block(SEXP dataexp);')
-            elif source.endswith('_java_tmp.cc'):
-                if line == 'SWIGEXPORT jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getString(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {':
-                    output.append('SWIGEXPORT jbyteArray JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getStringByteArray(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {')
-                    line = next(rofile).rstrip()
-                    if line == '  jstring jresult = 0 ;':
-                        output.append('  jbyteArray jresult = 0 ;')
-                        line = next(rofile).rstrip()
-                    while line != '  if (result) jresult = jenv->NewStringUTF((const char *)result);':
-                        output.append(line)
-                        line = next(rofile).rstrip()
-                    if line == '  if (result) jresult = jenv->NewStringUTF((const char *)result);':
-                        output.append('  if (result) {')
-                        output.append('    jsize len = strlen(result);')
-                        output.append('    jresult = jenv->NewByteArray(len);')
-                        output.append('    jenv->SetByteArrayRegion(jresult, 0, len, (jbyte *)result);')
-                        output.append('  }')
-                        output.append('  return jresult;')
-                        while line != '}':
-                            line = next(rofile).rstrip()
-                if line == 'SWIGEXPORT void JNICALL Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setString(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jstring jarg3, jlong jarg4) {':
-                    output.append('SWIGEXPORT void JNICALL Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setStringByteArray(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jbyteArray jarg3, jlong jarg4) {')
-                    line = next(rofile).rstrip()
-                    while line != '  if (jarg3) {':
-                        output.append(line)
-                        line = next(rofile).rstrip()
-                    if line == '  if (jarg3) {':
-                        output.append('  arg4 = (size_t)jarg4;')
-                        output.append('  if (jarg3) {')
-                        output.append('    arg3 = new char[arg4 + 1];')
-                        output.append('    if (!arg3) return;')
-                        output.append('    jenv->GetByteArrayRegion(jarg3, 0, jarg4, (jbyte *)arg3);')
-                        output.append('    arg3[arg4] = 0;')
-                        output.append('  }')
-                        output.append('  (arg1)->setString(arg2,arg3,arg4);')
-                        output.append('  if (arg3) delete [] arg3;')
-                        while line != '}':
-                            line = next(rofile).rstrip()
-            output.append(line)
-    with open(str(target), 'w') as fd:
-        fd.write('\n'.join(output))
-        fd.write('\n')
-    print("filter_swig_code: wrote file ", str(target))
-    # piggyback on exascript_java.cc target to patch *.java files (avoids error from multiple ways to build target)
-    if source.endswith('_java_tmp.cc'):
-        filter_java_swig_code(builddir)
-    return 0
-
-
-def filter_java_swig_code(builddir=''):
-    files = map(lambda s: os.path.join(builddir+f'{JAVA_SRC_PATH}/com/exasol/swig', s),
-                ['TableIterator.java', 'ResultHandler.java', 'exascript_javaJNI.java'])
-    for target in files:
-        output = []
-        with open(target) as target_file:
-            for line in target_file:
-                line = line.rstrip()
-                if target.endswith('TableIterator.java'):
-                    if line == '  public String getString(long col) {':
-                        line = '  public byte[] getString(long col) {'
-                    elif line == '    return exascript_javaJNI.TableIterator_getString(swigCPtr, this, col);':
-                        line = '    return exascript_javaJNI.TableIterator_getStringByteArray(swigCPtr, this, col);'
-                elif target.endswith('ResultHandler.java'):
-                    if line == '  public void setString(long col, String v, long l) {':
-                        line = '  public void setString(long col, byte[] v) {'
-                    elif line == '    exascript_javaJNI.ResultHandler_setString(swigCPtr, this, col, v, l);':
-                        line = '    exascript_javaJNI.ResultHandler_setStringByteArray(swigCPtr, this, col, v, v.length);'
-                elif target.endswith('exascript_javaJNI.java'):
-                    if line == '  public final static native String TableIterator_getString(long jarg1, TableIterator jarg1_, long jarg2);':
-                        line = '  public final static native byte[] TableIterator_getStringByteArray(long jarg1, TableIterator jarg1_, long jarg2);'
-                    elif line == '  public final static native void ResultHandler_setString(long jarg1, ResultHandler jarg1_, long jarg2, String jarg3, long jarg4);':
-                        line = '  public final static native void ResultHandler_setStringByteArray(long jarg1, ResultHandler jarg1_, long jarg2, byte[] jarg3, long jarg4);'
-                output.append(line)
-        with open(str(target), 'w') as fd:
-            fd.write('\n'.join(output))
-            fd.write('\n')
-    return 0
-
-
-if __name__ == "__main__":
-    if len(sys.argv) != 3:
-        print('Usage: filter_swig_code.py target source')
-        sys.exit(1)
-    print("filtering swig code ", str([sys.argv[1]]), str([sys.argv[2]]))
-    filter_swig_code([sys.argv[1]], [sys.argv[2]])
diff --git a/exaudfclient/base/java_repository.bzl b/exaudfclient/base/java_repository.bzl
deleted file mode 100644
index cceb053..0000000
--- a/exaudfclient/base/java_repository.bzl
+++ /dev/null
@@ -1,54 +0,0 @@
-load("@bazel_skylib//lib:paths.bzl", "paths")
-
-# Workaround for the problems of JNI/JVM with rpath's used by Bazel.
-# Problem Description:
-# - Bazel creates for all external local repositories symlinks into its build directory
-# - Bazel than writes during compilation these paths to the rpath of the binary
-# - JNI/JVM uses the rpath for loading additional shared libraries,
-#   but for a unknown reason it seems to truncate these paths.
-# - We assume two possible reason, the symlink paths of bazel contain a @, or
-#   the paths are to long and get for that reason truncated
-# - In the end, it we wasn't able to convince JNI/JVM from other paths
-#   for its libraries, as the original paths where apt installed the files.
-# Solution:
-# - We solved the problem by adding the original paths for the libraries into the rpath via the linkopts
-
-def _find_shared_libraries(prefix,library,p_repository_ctx):
-    command_result = p_repository_ctx.execute(["find", '%s'%prefix,'-name','%s'%library]) #TODO only one result
-    if command_result.return_code != 0:
-        fail("Could not acquire path of libjvm.so, got return code %s stderr: \n %s"
-            % (command_result.return_code, command_result.stderr))
-    path_to_library = command_result.stdout.strip("\n")
-    print("path to %s: %s"%(library,path_to_library))
-    return path_to_library
-
-def _java_local_repository_impl(repository_ctx):
-    prefix = "/usr/lib/jvm/java-11-openjdk-amd64"
-    if 'JAVA_PREFIX' in repository_ctx.os.environ:
-        prefix = repository_ctx.os.environ['JAVA_PREFIX']
-    print("java prefix in environment specified; %s"%prefix)
-
-    path_to_libjvm = paths.dirname(_find_shared_libraries(prefix,"libjvm.so",repository_ctx))
-
-    defines = '"ENABLE_JAVA_VM"'
-    build_file_content = """
-load("@rules_cc//cc:defs.bzl", "cc_library")
-
-cc_library(
-    name = "java",
-    srcs = glob(["{prefix}/include/*.h"], allow_empty=False),
-    hdrs = glob(["{prefix}/include/*.h","{prefix}/include/linux/*.h"], allow_empty=False),
-    includes = ["{prefix}/include","{prefix}/include/linux"],
-    defines = [{defines}],
-    linkopts = ["-ljvm","-L{rpath_libjvm}",'-Wl,-rpath','{rpath_libjvm}'],
-    visibility = ["//visibility:public"]
-)""".format( defines=defines, prefix="java", rpath_libjvm=path_to_libjvm)
-    print(build_file_content)
-
-    repository_ctx.symlink(prefix, "./java")
-    repository_ctx.file("BUILD", build_file_content)
-
-java_local_repository = repository_rule(
-    implementation=_java_local_repository_impl,
-    local = True,
-    environ = ["JAVA_PREFIX"])
diff --git a/exaudfclient/base/javacontainer/BUILD b/exaudfclient/base/javacontainer/BUILD
deleted file mode 100644
index 15c95e5..0000000
--- a/exaudfclient/base/javacontainer/BUILD
+++ /dev/null
@@ -1,153 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@rules_cc//cc:defs.bzl", "cc_library")
-
-genrule(
-    name = "exascript_java_tmp_cc",
-    cmd = """
-        mkdir -p java_src/com/exasol/swig
-        mkdir -p build_exascript_java_tmp_cc/exaudflib
-        cp "$(location //exaudflib:swig/script_data_transfer_objects_wrapper.h)" "$(location //exaudflib:exascript.i)" build_exascript_java_tmp_cc/exaudflib
-        cd build_exascript_java_tmp_cc
-        swig -v -O -DEXTERNAL_PROCESS -Wall -c++ -java -addextern -module exascript_java -package com.exasol.swig -outdir "../java_src/com/exasol/swig" -o "../exascript_java_tmp.cc" exaudflib/exascript.i
-        cd ..
-        cp java_src/com/exasol/swig/ConnectionInformationWrapper.java $(location ConnectionInformationWrapper.java)
-        cp java_src/com/exasol/swig/exascript_java.java $(location exascript_java.java)
-        cp java_src/com/exasol/swig/exascript_javaJNI.java $(location raw/exascript_javaJNI.java)
-        cp java_src/com/exasol/swig/ExportSpecificationWrapper.java $(location ExportSpecificationWrapper.java)
-        cp java_src/com/exasol/swig/ImportSpecificationWrapper.java $(location ImportSpecificationWrapper.java)
-        cp java_src/com/exasol/swig/Metadata.java $(location Metadata.java)
-        cp java_src/com/exasol/swig/ResultHandler.java $(location raw/ResultHandler.java)
-        cp java_src/com/exasol/swig/SWIGTYPE_p_ExecutionGraph__ExportSpecification.java $(location SWIGTYPE_p_ExecutionGraph__ExportSpecification.java)
-        cp java_src/com/exasol/swig/SWIGTYPE_p_ExecutionGraph__ImportSpecification.java $(location SWIGTYPE_p_ExecutionGraph__ImportSpecification.java)
-        cp java_src/com/exasol/swig/SWIGVM_datatype_e.java $(location SWIGVM_datatype_e.java)
-        cp java_src/com/exasol/swig/SWIGVM_itertype_e.java $(location SWIGVM_itertype_e.java)
-        cp java_src/com/exasol/swig/TableIterator.java $(location raw/TableIterator.java)
-        cp exascript_java_tmp.cc $(location exascript_java_tmp.cc)
-    """,
-    outs = ["ConnectionInformationWrapper.java",
-            "exascript_java.java",
-            "ExportSpecificationWrapper.java",
-            "ImportSpecificationWrapper.java",
-            "Metadata.java",
-            "SWIGTYPE_p_ExecutionGraph__ExportSpecification.java",
-            "SWIGTYPE_p_ExecutionGraph__ImportSpecification.java",
-            "SWIGVM_datatype_e.java",
-            "SWIGVM_itertype_e.java",
-            "raw/exascript_javaJNI.java",
-            "raw/ResultHandler.java",
-            "raw/TableIterator.java",
-            "exascript_java_tmp.cc"
-    ],
-    srcs = ["//exaudflib:exascript.i","//exaudflib:swig/script_data_transfer_objects_wrapper.h"]
-)
-
-genrule(
-    name = "exascript_java_tmp_h",
-    cmd = """
-        mkdir build_exascript_java_tmp_h
-        cp "$(location //exaudflib:swig/script_data_transfer_objects_wrapper.h)" "$(location //exaudflib:exascript.i)" build_exascript_java_tmp_h
-        cp -r "$(location exascript_java_tmp.cc)" build_exascript_java_tmp_h
-        cd build_exascript_java_tmp_h
-        swig -v -DEXTERNAL_PROCESS -c++ -java -external-runtime "../$(location exascript_java_tmp.h)"
-        """,
-    outs = ["exascript_java_tmp.h"],
-    srcs = ["//exaudflib:exascript.i","//exaudflib:swig/script_data_transfer_objects_wrapper.h", ":exascript_java_tmp.cc"]
-)
-
-
-genrule(
-    name = "filter_swig_code_exascript_java_h",
-    cmd = 'python3 $(location //:filter_swig_code.py) "$@" "$<"',
-    outs = ["exascript_java.h"],
-    srcs = [":exascript_java_tmp_h"],
-    tools = ["//:filter_swig_code.py"]
-)
-
-genrule(
-    name = "filter_swig_code_exascript_java_cc",
-    cmd = """
-            TMPDIR=`mktemp -d`
-            mkdir -p "$$TMPDIR"/java_src/com/exasol/swig
-            cp  $(location :raw/TableIterator.java) "$$TMPDIR"/java_src/com/exasol/swig/
-            cp  $(location :raw/ResultHandler.java) "$$TMPDIR"/java_src/com/exasol/swig/
-            cp  $(location :raw/exascript_javaJNI.java) "$$TMPDIR"/java_src/com/exasol/swig/
-            find "$$TMPDIR"/java_src/com/exasol/swig/ -name *.java -type f -exec chmod 644 {} \\;
-            cp -r -L $(location //:filter_swig_code.py) $(location :exascript_java_tmp.cc) "$$TMPDIR"
-            (cd "$$TMPDIR"
-            python3 filter_swig_code.py "exascript_java.cc" "exascript_java_tmp.cc")
-            cp "$$TMPDIR"/exascript_java.cc $(location :exascript_java.cc)
-            cp "$$TMPDIR"/java_src/com/exasol/swig/TableIterator.java $(location TableIterator.java)
-            cp "$$TMPDIR"/java_src/com/exasol/swig/ResultHandler.java $(location ResultHandler.java)
-            cp "$$TMPDIR"/java_src/com/exasol/swig/exascript_javaJNI.java $(location exascript_javaJNI.java)
-            rm -rf "$$TMPDIR"
-            """,
-    outs = [
-            "exascript_java.cc",
-            "TableIterator.java",
-            "ResultHandler.java",
-            "exascript_javaJNI.java"
-            ],
-    srcs = [":exascript_java_tmp.cc", ":raw/TableIterator.java",
-            ":raw/ResultHandler.java", ":raw/exascript_javaJNI.java"],
-    tools = ["//:filter_swig_code.py"]
-)
-
-cc_library(
-    name = "exascript_java",
-    srcs = [":exascript_java.cc",],
-    deps = ["@java//:java","//exaudflib:exaudflib-deps","//exaudflib:header"],
-    copts= ["-O0","-fno-lto"],
-    # We limit this target to -O0 (no optimization) and -fno-lto. because otherwise we get compiler warnings of the sort 
-    # note: "code may be misoptimized unless -fno-strict-aliasing is used." 
-    # Normally, this indicates that compiling with higher optimizations levels may break your program. Until now, we don't have enough tests
-    # to verify if higher levels of optimizations might work. We needed to deactivate link time optimization, too, because this delay the compilation
-    # until the exaudfclient binary is build and causes than there the same problem.
-    alwayslink=True,
-)
-
-cc_library(
-    name = "javacontainer",
-    srcs = [":javacontainer.cc", ":javacontainer.h", ":javacontainer_impl.cc", ":javacontainer_impl.h",
-            ":javacontainer_builder.h", ":javacontainer_builder.cc", ":dummy"],
-    hdrs = [":filter_swig_code_exascript_java_h", "exascript_java_jni_decl.h"],
-    deps = ["@java//:java", ":exascript_java", "//exaudflib:header",
-            "//utils:utils","//javacontainer/script_options:java_script_option_lines",
-            "//swig_factory:swig_factory"],
-#    copts= ["-O0","-fno-lto"],
-    alwayslink=True,
-)
-
-#workaround to build jars together with javacontainer c++ library
-genrule(
-    name = "dummy",
-    cmd = 'touch "$@"',
-    outs = ["dummy.h"],
-    srcs = [":exaudf_deploy.jar"],
-)
-
-java_binary(
-    name = "exaudf",
-    srcs = glob(["*.java"])+
-                #The following are generated classes
-                [
-                ":ConnectionInformationWrapper.java",
-                ":exascript_java.java",
-                ":exascript_javaJNI.java",
-                ":ExportSpecificationWrapper.java",
-                ":ImportSpecificationWrapper.java",
-                ":Metadata.java",
-                ":ResultHandler.java",
-                ":SWIGTYPE_p_ExecutionGraph__ExportSpecification.java",
-                ":SWIGTYPE_p_ExecutionGraph__ImportSpecification.java",
-                ":SWIGVM_datatype_e.java",
-                ":SWIGVM_itertype_e.java",
-                ":TableIterator.java"
-                ],
-    deps = ["@maven//:com_exasol_udf_api_java"],
-    create_executable=False,
-)
-
-exports_files([
-    "ExaStackTraceCleaner.java",
-    ])
diff --git a/exaudfclient/base/javacontainer/ExaCompiler.java b/exaudfclient/base/javacontainer/ExaCompiler.java
deleted file mode 100644
index 947fa0e..0000000
--- a/exaudfclient/base/javacontainer/ExaCompiler.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.exasol;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.io.StringWriter;
-import javax.tools.SimpleJavaFileObject;
-import javax.tools.JavaFileObject;
-import javax.tools.ToolProvider;
-import javax.tools.JavaCompiler;
-import javax.tools.JavaCompiler.CompilationTask;
-import java.net.URI;
-
-class ExaCompiler {
-    static void compile(String classname, String code, String classpath) throws ExaCompilationException {
-        temporaryClasspath = classpath;
-        JavaFileObject file = new JavaSource(classname, code);
-        Iterable<? extends JavaFileObject> compilationUnits = Arrays.asList(file);
-        List<String> optionList = new ArrayList<String>(Arrays.asList("-d", temporaryClasspath));
-
-        JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
-        StringWriter compilationOutput = new StringWriter();
-        CompilationTask task = compiler.getTask(compilationOutput, null, null, optionList, null, compilationUnits);
-
-        boolean success = false;
-        try {	
-            success = task.call();
-        } catch (Exception e) {
-            // ignore
-        }
-        if (!success) {
-            throw new ExaCompilationException("F-UDF-CL-SL-JAVA-1158: "+compilationOutput.toString());
-        }
-    }
-
-    static void compile(String classname, String code) throws ExaCompilationException {
-        compile(classname, code, temporaryClasspath);
-    }
-
-    private static class JavaSource extends SimpleJavaFileObject {
-        final String code;
-
-        JavaSource(String classname, String code) {
-            super(URI.create("string:///" + classname.replace(".","/") + Kind.SOURCE.extension), Kind.SOURCE);
-            this.code = code;
-        }
-
-        @Override
-        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
-            return this.code;
-        }
-    }
-
-    private static String temporaryClasspath;
-}
diff --git a/exaudfclient/base/javacontainer/ExaConnectionInformationImpl.java b/exaudfclient/base/javacontainer/ExaConnectionInformationImpl.java
deleted file mode 100644
index 1d17c78..0000000
--- a/exaudfclient/base/javacontainer/ExaConnectionInformationImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.exasol;
-
-
-public class ExaConnectionInformationImpl implements ExaConnectionInformation {
-
-    private ConnectionType type;
-    private String address;
-    private String user;
-    private String password;
-
-    public ExaConnectionInformationImpl(String type, String address, String user, String password)
-    {
-        if (type.equals("password")) {
-            this.type = ConnectionType.PASSWORD;
-        } else {
-            throw new IllegalStateException("F-UDF-CL-SL-JAVA-1157: ExaConnectionInformationImpl: received unknown connection type: "+type);
-        }
-        this.address = address;
-        this.user = user;
-        this.password = password;
-    }
-
-    @Override
-    public ConnectionType getType() {return type;}
-
-    @Override
-    public String getAddress() {return address;}
-
-    @Override
-    public String getUser() {return user;}
-
-    @Override
-    public String getPassword() {return password;}
-
-}
diff --git a/exaudfclient/base/javacontainer/ExaExportSpecificationImpl.java b/exaudfclient/base/javacontainer/ExaExportSpecificationImpl.java
deleted file mode 100644
index fe3f1d5..0000000
--- a/exaudfclient/base/javacontainer/ExaExportSpecificationImpl.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.exasol;
-
-
-import java.util.List;
-import java.util.Map;
-
-
-public class ExaExportSpecificationImpl implements ExaExportSpecification {
-
-
-    private String connectionName;
-    private ExaConnectionInformation connectionInformation;
-    private Map<String,String> parameters;
-    private boolean hasTruncate;
-    private boolean hasReplace;
-    private String createdBy;
-    private List<String> sourceColumnNames;
-    
-    public ExaExportSpecificationImpl(String connectionName, ExaConnectionInformation connectionInformation, Map<String,String> parameters,
-                                      boolean hasTruncate, boolean hasReplace, String createdBy,
-                                      List<String> sourceColumnNames) {
-        this.connectionName = connectionName;
-        this.connectionInformation = connectionInformation;
-        this.parameters = parameters;
-        this.hasTruncate = hasTruncate;
-        this.hasReplace = hasReplace;
-        this.createdBy = createdBy;
-        this.sourceColumnNames = sourceColumnNames;
-    }
-
-    @Override
-    public boolean hasConnectionName() {
-        return connectionName != null;
-    }
-
-    @Override
-    public String getConnectionName() {
-        return connectionName;
-    }
-
-    @Override
-    public boolean hasConnectionInformation() {
-        return connectionInformation != null;
-    }
-
-    // same class as used for getConnection()
-    @Override
-    public ExaConnectionInformation getConnectionInformation() {
-        return connectionInformation;
-    }
-
-    @Override
-    public Map<String, String> getParameters() {
-        return parameters;
-    }
-
-    @Override
-    public boolean hasTruncate() {
-        return hasTruncate;
-    }
-
-    @Override
-    public boolean hasReplace() {
-        return hasReplace;
-    }
-
-    @Override
-    public boolean hasCreatedBy() {
-        return createdBy != null;
-    }
-
-    @Override
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    @Override
-    public List<String> getSourceColumnNames() {
-        return sourceColumnNames;
-    }
-
-}
diff --git a/exaudfclient/base/javacontainer/ExaImportSpecificationImpl.java b/exaudfclient/base/javacontainer/ExaImportSpecificationImpl.java
deleted file mode 100644
index 11e9c73..0000000
--- a/exaudfclient/base/javacontainer/ExaImportSpecificationImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.exasol;
-
-
-import java.util.List;
-import java.util.Map;
-
-
-public class ExaImportSpecificationImpl implements ExaImportSpecification {
-
-
-    private boolean isSubselect;
-    private List<String> subselectColumnNames;
-    private List<String> subselectColumnTypes;
-    private String connectionName;
-    private ExaConnectionInformation connectionInformation;
-    private Map<String,String> parameters;
-    
-    public ExaImportSpecificationImpl(boolean isSubselect, List<String> subselectColumnNames, List<String> subselectColumnTypes, String connectionName, ExaConnectionInformation connectionInformation, Map<String,String> parameters) {
-        this.isSubselect = isSubselect;
-        this.subselectColumnNames = subselectColumnNames;
-        this.subselectColumnTypes = subselectColumnTypes;
-        this.connectionName = connectionName;
-        this.connectionInformation = connectionInformation;
-        this.parameters = parameters;
-    }
-    
-    @Override
-    public boolean isSubselect() {
-        return isSubselect;
-    }
-
-    @Override
-    public List<String> getSubselectColumnNames() {
-        return subselectColumnNames;
-    }
-
-    // returns a string like "VARCHAR(100)"
-    @Override
-    public List<String> getSubselectColumnSqlTypes() {
-        return subselectColumnTypes;
-    }
-
-    @Override
-    public boolean hasConnectionName() {
-        return connectionName != null;
-    }
-
-    @Override
-    public String getConnectionName() {
-        return connectionName;
-    }
-
-    @Override
-    public boolean hasConnectionInformation() {
-        return connectionInformation != null;
-    }
-
-    // same class as used for getConnection()
-    @Override
-    public ExaConnectionInformation getConnectionInformation() {
-        return connectionInformation;
-    }
-
-    @Override
-    public Map<String, String> getParameters() {
-        return parameters;
-    }
-}
diff --git a/exaudfclient/base/javacontainer/ExaIteratorImpl.java b/exaudfclient/base/javacontainer/ExaIteratorImpl.java
deleted file mode 100644
index 567c10d..0000000
--- a/exaudfclient/base/javacontainer/ExaIteratorImpl.java
+++ /dev/null
@@ -1,679 +0,0 @@
-package com.exasol;
-
-import java.util.ArrayList;
-import java.io.PrintWriter;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigDecimal;
-import java.sql.Date;
-import java.sql.Timestamp;
-import java.io.IOError;
-import com.exasol.swig.ResultHandler;
-import com.exasol.swig.TableIterator;
-import com.exasol.swig.Metadata;
-
-class ExaIteratorImpl implements ExaIterator {
-    private ExaMetadata exaMetadata;
-    private TableIterator tableIterator;
-    private ResultHandler resultHandler;
-    private boolean finished;
-    private boolean singleInput;
-    private boolean singleOutput;
-    private boolean insideRun;
-    private Object[] cache;
-    private String[] inputColumnTypes;
-    private String[] outputColumnTypes;
-    private ArrayList<String> columnNames;
-
-    @Override
-    public long size() throws ExaIterationException {
-        long size = tableIterator.rowsInGroup();
-        String exMsg = tableIterator.checkException();
-        if (exMsg != null && exMsg.length() > 0) {
-            throw new ExaIterationException("F-UDF-CL-SL-JAVA-1101: "+exMsg);
-        }
-        return size;
-    }
-
-    @Override
-    public boolean next() throws ExaIterationException {
-        if (insideRun && singleInput)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1102: next() function is not allowed in scalar context");
-        clearCache();
-        if (finished)
-            return false;
-        boolean next = tableIterator.next();
-        String exMsg = tableIterator.checkException();
-        if (exMsg != null && exMsg.length() > 0) {
-            throw new ExaIterationException("F-UDF-CL-SL-JAVA-1103: "+exMsg);
-        }
-        if (!next)
-            finished = true;
-        return next;
-    }
-
-    @Override
-    public void reset() throws ExaIterationException {
-        if (singleInput)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1104: reset() function is not allowed in scalar context");
-        clearCache();
-        tableIterator.reset();
-        String exMsg = tableIterator.checkException();
-        if (exMsg != null && exMsg.length() > 0) {
-            throw new ExaIterationException("F-UDF-CL-SL-JAVA-1105: "+exMsg);
-        }
-        finished = false;
-    }
-
-    @Override
-    public void emit(Object... values) throws ExaIterationException, ExaDataTypeException {
-        if (insideRun && singleOutput)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1106: emit() function is not allowed in scalar context");
-
-        if(values != null){
-            if (values.length != exaMetadata.getOutputColumnCount()) {
-                String errorText = "E-UDF-CL-SL-JAVA-1107: emit() takes exactly " + exaMetadata.getOutputColumnCount();
-                errorText += (exaMetadata.getOutputColumnCount() > 1) ? " arguments" : " argument";
-                errorText += " (" + values.length + " given)";
-                throw new ExaIterationException(errorText);
-            }
-
-            for (int i = 0; i < values.length; i++) {
-                if (values[i] == null) {
-                    resultHandler.setNull(i);
-                }
-                else if (values[i] instanceof Byte || values[i] instanceof Short || values[i] instanceof Integer) {
-                    Number val = (Number) values[i];
-                    if (outputColumnTypes[i].equals("INT32"))
-                        resultHandler.setInt32(i, val.intValue());
-                    else if (outputColumnTypes[i].equals("INT64"))
-                        resultHandler.setInt64(i, val.longValue());
-                    else if (outputColumnTypes[i].equals("NUMERIC"))
-                        resultHandler.setNumeric(i, val.toString());
-                    else if (outputColumnTypes[i].equals("DOUBLE"))
-                        resultHandler.setDouble(i, val.doubleValue());
-                    else
-                        throw new ExaDataTypeException(
-                            "E-UDF-CL-SL-JAVA-1108: emit column '" + 
-                            exaMetadata.getOutputColumnName(i) + 
-                            "' is of type " + 
-                            outputColumnTypes[i] + 
-                            " but data given have type " + 
-                            values[i].getClass().getCanonicalName()
-                            );
-                }
-                else if (values[i] instanceof Long) {
-                    Long val = (Long) values[i];
-                    if (outputColumnTypes[i].equals("INT32")) {
-                        if (isConversionToIntegerSafe(val, exaMetadata.getOutputColumnName(i)))
-                            resultHandler.setInt32(i, val.intValue());
-                    }
-                    else if (outputColumnTypes[i].equals("INT64"))
-                        resultHandler.setInt64(i, val.longValue());
-                    else if (outputColumnTypes[i].equals("NUMERIC"))
-                        resultHandler.setNumeric(i, val.toString());
-                    else if (outputColumnTypes[i].equals("DOUBLE"))
-                        resultHandler.setDouble(i, val.doubleValue());
-                    else
-                        throw new ExaDataTypeException(
-                            "E-UDF-CL-SL-JAVA-1109: emit column '" + 
-                            exaMetadata.getOutputColumnName(i) + 
-                            "' is of type " + 
-                            outputColumnTypes[i] + 
-                            " but data given have type " + 
-                            values[i].getClass().getCanonicalName()
-                            );
-                }
-                else if (values[i] instanceof Float || values[i] instanceof Double) {
-                    Number val = (Number) values[i];
-                    if (outputColumnTypes[i].equals("INT32")) {
-                        if (isConversionToIntegerSafe(val, exaMetadata.getOutputColumnName(i)))
-                            resultHandler.setInt32(i, val.intValue());
-                    }
-                    else if (outputColumnTypes[i].equals("INT64")) {
-                        if (isConversionToLongSafe(val, exaMetadata.getOutputColumnName(i)))
-                            resultHandler.setInt64(i, val.longValue());
-                    }
-                    else if (outputColumnTypes[i].equals("NUMERIC"))
-                        resultHandler.setNumeric(i, val.toString());
-                    else if (outputColumnTypes[i].equals("DOUBLE"))
-                        resultHandler.setDouble(i, val.doubleValue());
-                    else
-                        throw new ExaDataTypeException(
-                            "E-UDF-CL-SL-JAVA-1110: emit column '" + 
-                            exaMetadata.getOutputColumnName(i) + 
-                            "' is of type "+ 
-                            outputColumnTypes[i] + 
-                            " but data given have type " + 
-                            values[i].getClass().getCanonicalName()
-                            );
-                }
-                else if (values[i] instanceof BigDecimal) {
-                    BigDecimal val = (BigDecimal) values[i];
-                    if (outputColumnTypes[i].equals("INT32"))
-                        resultHandler.setInt32(i, val.intValueExact());
-                    else if (outputColumnTypes[i].equals("INT64"))
-                        resultHandler.setInt64(i, val.longValueExact());
-                    else if (outputColumnTypes[i].equals("NUMERIC"))
-                        resultHandler.setNumeric(i, val.toString());
-                    else if (outputColumnTypes[i].equals("DOUBLE"))
-                        resultHandler.setDouble(i, val.doubleValue());
-                    else
-                        throw new ExaDataTypeException(
-                            "E-UDF-CL-SL-JAVA-1111: emit column '" + 
-                            exaMetadata.getOutputColumnName(i) + 
-                            "' is of type " + 
-                            outputColumnTypes[i] + 
-                            " but data given have type " + 
-                            values[i].getClass().getCanonicalName()
-                            );
-                }
-                else if (values[i] instanceof Boolean) {
-                    Boolean val = (Boolean) values[i];
-                    if (outputColumnTypes[i].equals("BOOLEAN"))
-                        resultHandler.setBoolean(i, val.booleanValue());
-                    else
-                        throw new ExaDataTypeException(
-                            "E-UDF-CL-SL-JAVA-1112: emit column '" + 
-                            exaMetadata.getOutputColumnName(i) + 
-                            "' is of type " + 
-                            outputColumnTypes[i] + 
-                            " but data given have type " + 
-                            values[i].getClass().getCanonicalName()
-                            );
-                }
-                else if (values[i] instanceof String) {
-                    String val = (String) values[i];
-                    if (outputColumnTypes[i].equals("STRING")) {
-                        byte[] utf8Bytes = null;
-                        try {
-                            utf8Bytes = val.getBytes("UTF-8");
-                        } catch (java.io.UnsupportedEncodingException ex) {
-                            throw new ExaDataTypeException(
-                                "E-UDF-CL-SL-JAVA-1113: Column with name '" + 
-                                exaMetadata.getOutputColumnName(i) + 
-                                "' contains invalid UTF-8 data"
-                                );
-                        }
-                        resultHandler.setString(i, utf8Bytes);
-                    }
-                    else
-                        throw new ExaDataTypeException(
-                            "E-UDF-CL-SL-JAVA-1114: emit column '" + 
-                            exaMetadata.getOutputColumnName(i) + 
-                            "' is of type " + 
-                            outputColumnTypes[i] + 
-                            " but data given have type " + 
-                            values[i].getClass().getCanonicalName()
-                            );
-                }
-                else if (values[i] instanceof Date) {
-                    Date val = (Date) values[i];
-                    if (outputColumnTypes[i].equals("DATE"))
-                        resultHandler.setDate(i, val.toString());
-                    else
-                        throw new ExaDataTypeException(
-                            "E-UDF-CL-SL-JAVA-1115: emit column '" + 
-                            exaMetadata.getOutputColumnName(i) + 
-                            "' is of type " + 
-                            outputColumnTypes[i] + 
-                            " but data given have type " + 
-                            values[i].getClass().getCanonicalName()
-                            );
-                }
-                else if (values[i] instanceof Timestamp) {
-                    Timestamp val = (Timestamp) values[i];
-                    if (outputColumnTypes[i].equals("TIMESTAMP"))
-                        resultHandler.setTimestamp(i, val.toString());
-                    else
-                        throw new ExaDataTypeException(
-                            "E-UDF-CL-SL-JAVA-1116: emit column '" + 
-                            exaMetadata.getOutputColumnName(i) + 
-                            "' is of type " + 
-                            outputColumnTypes[i] + 
-                            " but data given have type " + 
-                            values[i].getClass().getCanonicalName()
-                            );
-                }
-                else {
-                    throw new ExaDataTypeException(
-                        "E-UDF-CL-SL-JAVA-1117: emit column '" + 
-                        exaMetadata.getOutputColumnName(i) + 
-                        "' is of unsupported type " + 
-                        values[i].getClass().getCanonicalName()
-                        );
-                }
-
-                String exMsg = resultHandler.checkException();
-                if (exMsg != null && exMsg.length() > 0) {
-                    throw new ExaIterationException("E-UDF-CL-SL-JAVA-1118: "+exMsg);
-                }
-            }
-        }else{
-            if(exaMetadata.getOutputColumnCount()==1){
-              resultHandler.setNull(0);
-            }else{
-              String errorText = "E-UDF-CL-SL-JAVA-1119: emit() takes exactly " + exaMetadata.getOutputColumnCount();
-              errorText += (exaMetadata.getOutputColumnCount() > 1) ? " arguments" : " argument";
-              errorText += " (" + 1 + " given)";
-              throw new ExaIterationException(errorText);
-            }
-        }
-
-        boolean next = resultHandler.next();
-        String exMsg = resultHandler.checkException();
-        if (exMsg != null && exMsg.length() > 0) {
-            throw new ExaIterationException("F-UDF-CL-SL-JAVA-1120: "+exMsg);
-        }
-        if (!next) {
-            throw new ExaIterationException("F-UDF-CL-SL-JAVA-1121: Internal error while emiting row");
-        }
-    }
-
-    @Override
-    public Integer getInteger(int column) throws ExaIterationException, ExaDataTypeException {
-        Object object = getObject(column);
-        if (object == null)
-            return null;
-        if (!isConversionToIntegerSafe(object, columnNames.get(column)))
-            return null;
-        if (object instanceof Integer)
-            return (Integer) object;
-        else if (object instanceof Long)
-            return new Integer(((Long) object).intValue());
-        else if (object instanceof BigDecimal)
-            return new Integer(((BigDecimal) object).intValueExact());
-        else if (object instanceof Double)
-            return new Integer(((Double) object).intValue());
-        else
-            throw 
-              new ExaDataTypeException(
-                "E-UDF-CL-SL-JAVA-1122: getInteger cannot convert column '" + 
-                columnNames.get(column) + 
-                "' of type " + 
-                exaMetadata.getInputColumnSqlType(column) + 
-                " to an Integer"
-                );
-    }
-
-    @Override
-    public Integer getInteger(String name) throws ExaIterationException, ExaDataTypeException {
-        int col = columnNames.indexOf(name);
-        if (col == -1)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1123: Column with name '" + name + "' does not exist");
-        return getInteger(col);
-    }
-
-    @Override
-    public Long getLong(int column) throws ExaIterationException, ExaDataTypeException {
-        Object object = getObject(column);
-        if (object == null)
-            return null;
-        if (!isConversionToLongSafe(object, columnNames.get(column)))
-            return null;
-        if (object instanceof Integer)
-            return new Long(((Integer) object).longValue());
-        else if (object instanceof Long)
-            return (Long) object;
-        else if (object instanceof BigDecimal)
-            return new Long(((BigDecimal) object).longValueExact());
-        else if (object instanceof Double)
-            return new Long(((Double) object).longValue());
-        else
-            throw 
-              new ExaDataTypeException(
-                "E-UDF-CL-SL-JAVA-1124: getLong cannot convert column '" + 
-                columnNames.get(column) + 
-                "' of type " + 
-                exaMetadata.getInputColumnSqlType(column) + 
-                " to a Long"
-                );
-    }
-
-    @Override
-    public Long getLong(String name) throws ExaIterationException, ExaDataTypeException {
-        int col = columnNames.indexOf(name);
-        if (col == -1)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1125: Column with name '" + name + "' does not exist");
-        return getLong(col);
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(int column) throws ExaIterationException, ExaDataTypeException {
-        Object object = getObject(column);
-        if (object == null)
-            return null;
-        if (object instanceof Integer)
-            return new BigDecimal(((Integer) object).intValue());
-        else if (object instanceof Long)
-            return new BigDecimal(((Long) object).longValue());
-        else if (object instanceof BigDecimal)
-            return (BigDecimal) object;
-        else if (object instanceof Double)
-            return new BigDecimal(((Double) object).doubleValue());
-        else
-            throw 
-              new ExaDataTypeException(
-                "E-UDF-CL-SL-JAVA-1126: getBigDecimal cannot convert column '" + 
-                columnNames.get(column) + 
-                "' of type " + 
-                exaMetadata.getInputColumnSqlType(column) + 
-                " to a BigDecimal"
-                );
-    }
-
-    @Override
-    public BigDecimal getBigDecimal(String name) throws ExaIterationException, ExaDataTypeException {
-        int col = columnNames.indexOf(name);
-        if (col == -1)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1127: Column with name '" + name + "' does not exist");
-        return getBigDecimal(col);
-    }
-
-    @Override
-    public Double getDouble(int column) throws ExaIterationException, ExaDataTypeException {
-        Object object = getObject(column);
-        if (object == null)
-            return null;
-        if (object instanceof Integer)
-            return new Double(((Integer)object).doubleValue());
-        else if (object instanceof Long)
-            return new Double(((Long)object).doubleValue());
-        else if (object instanceof BigDecimal)
-            return new Double(((BigDecimal)object).doubleValue());
-        else if (object instanceof Double)
-            return (Double) object;
-        else
-            throw 
-              new ExaDataTypeException(
-                  "E-UDF-CL-SL-JAVA-1128: getDouble cannot convert column '" + 
-                  columnNames.get(column) + 
-                  "' of type " + 
-                  exaMetadata.getInputColumnSqlType(column) + 
-                  " to a Double"
-                  );
-    }
-
-    @Override
-    public Double getDouble(String name) throws ExaIterationException, ExaDataTypeException {
-        int col = columnNames.indexOf(name);
-        if (col == -1)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1129: Column with name '" + name + "' does not exist");
-        return getDouble(col);
-    }
-
-    @Override
-    public String getString(int column) throws ExaIterationException, ExaDataTypeException {
-        Object object = getObject(column);
-        if (object == null)
-            return null;
-        if (object instanceof String)
-            return (String) object;
-        else if (object instanceof Integer || object instanceof Long || object instanceof BigDecimal || object instanceof Double ||
-                    object instanceof Boolean || object instanceof Date || object instanceof Timestamp)
-            return object.toString();
-        else
-            throw 
-              new ExaDataTypeException(
-                  "E-UDF-CL-SL-JAVA-1130: getString cannot convert column '" + 
-                  columnNames.get(column) + 
-                  "' of type " + 
-                  exaMetadata.getInputColumnSqlType(column) + 
-                  " to a String"
-                  );
-    }
-
-    @Override
-    public String getString(String name) throws ExaIterationException, ExaDataTypeException {
-        int col = columnNames.indexOf(name);
-        if (col == -1)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1131: Column with name '" + name + "' does not exist");
-        return getString(col);
-    }
-
-    @Override
-    public Boolean getBoolean(int column) throws ExaIterationException, ExaDataTypeException {
-        Object object = getObject(column);
-        if (object == null)
-            return null;
-        if (object instanceof Boolean)
-            return (Boolean) object;
-        else
-            throw new ExaDataTypeException(
-                "E-UDF-CL-SL-JAVA-1132: getBoolean cannot convert column '" + 
-                columnNames.get(column) + 
-                "' of type " + 
-                exaMetadata.getInputColumnSqlType(column) + 
-                " to a Boolean"
-                );
-    }
-
-    @Override
-    public Boolean getBoolean(String name) throws ExaIterationException, ExaDataTypeException {
-        int col = columnNames.indexOf(name);
-        if (col == -1)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1133: Column with name '" + name + "' does not exist");
-        return getBoolean(col);
-    }
-
-    @Override
-    public Date getDate(int column) throws ExaIterationException, ExaDataTypeException {
-        Object object = getObject(column);
-        if (object == null)
-            return null;
-        if (object instanceof Date)
-            return (Date) object;
-        else
-            throw 
-              new ExaDataTypeException(
-                  "E-UDF-CL-SL-JAVA-1134: getDate cannot convert column '" + 
-                  columnNames.get(column) + 
-                  "' of type " + 
-                  exaMetadata.getInputColumnSqlType(column) + 
-                  " to a Date");
-    }
-
-    @Override
-    public Date getDate(String name) throws ExaIterationException, ExaDataTypeException {
-        int col = columnNames.indexOf(name);
-        if (col == -1)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1135: Column with name '" + name + "' does not exist");
-        return getDate(col);
-    }
-
-    @Override
-    public Timestamp getTimestamp(int column) throws ExaIterationException, ExaDataTypeException {
-        Object object = getObject(column);
-        if (object == null)
-            return null;
-        if (object instanceof Timestamp)
-            return (Timestamp) object;
-        else
-            throw 
-              new ExaDataTypeException(
-                  "E-UDF-CL-SL-JAVA-1136: getTimestamp cannot convert column '" + 
-                  columnNames.get(column) + 
-                  "' of type " + 
-                  exaMetadata.getInputColumnSqlType(column) + 
-                  " to a Timestamp"
-                  );
-    }
-
-    @Override
-    public Timestamp getTimestamp(String name) throws ExaIterationException, ExaDataTypeException {
-        int col = columnNames.indexOf(name);
-        if (col == -1)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1137: Column with name '" + name + "' does not exist");
-        return getTimestamp(col);
-    }
-
-    @Override
-    public Object getObject(int column) throws ExaIterationException, ExaDataTypeException {
-        if (column < 0 || column >= exaMetadata.getInputColumnCount())
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1138: Column number " + column + " does not exist");
-
-        if (finished)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1139: Iteration finished");
-
-        if (cache[column] != null)
-            return cache[column];
-
-        Object val = null;
-        switch (inputColumnTypes[column]) {
-            case "INT32":
-                val = new Integer(tableIterator.getInt32(column));
-                break;
-            case "INT64":
-                val = new Long(tableIterator.getInt64(column));
-                break;
-            case "NUMERIC":
-                String numeric = tableIterator.getNumeric(column);
-                if (!tableIterator.wasNull())
-                    val = new BigDecimal(numeric);
-                break;
-            case "DOUBLE":
-                val = new Double(tableIterator.getDouble(column));
-                break;
-            case "STRING":
-                byte[] utf8Bytes = tableIterator.getString(column);
-                try {
-                    val = new String(utf8Bytes, "UTF-8");
-                } catch (java.io.UnsupportedEncodingException ex) {
-                    throw new ExaDataTypeException("F-UDF-CL-SL-JAVA-1140: Column with name '" + columnNames.get(column) + "' contains invalid UTF-8 data");
-                }
-                break;
-            case "BOOLEAN":
-                val = new Boolean(tableIterator.getBoolean(column));
-                break;
-            case "DATE":
-                String date = tableIterator.getDate(column);
-                if (!tableIterator.wasNull())
-                    val = Date.valueOf(date);
-                break;
-            case "TIMESTAMP":
-                String timestamp = tableIterator.getTimestamp(column);
-                if (!tableIterator.wasNull())
-                    val = Timestamp.valueOf(timestamp);
-                break;
-            default:
-                throw new ExaDataTypeException("F-UDF-CL-SL-JAVA-1141: Column with name '" + columnNames.get(column) + "' has an invalid data type");
-        }
-        if (tableIterator.wasNull())
-            val = null;
-        cache[column] = val;
-        return val;
-    }
-
-    @Override
-    public Object getObject(String name) throws ExaIterationException, ExaDataTypeException {
-        int col = columnNames.indexOf(name);
-        if (col == -1)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1142: Column with name '" + name + "' does not exist");
-        return getObject(col);
-    }
-
-    private boolean isConversionToIntegerSafe(Object from, String name) throws ExaDataTypeException {
-        if (from == null)
-            return false;
-
-        if (from instanceof Long) {
-            long val = (Long) from;
-            if (val > Integer.MAX_VALUE)
-                throw new ExaDataTypeException("E-UDF-CL-SL-JAVA-1143: emit column '" + name + "' has value of "
-                            + val + " but column can only have maximum value of " + Integer.MAX_VALUE);
-            if (val < Integer.MIN_VALUE)
-                throw new ExaDataTypeException("E-UDF-CL-SL-JAVA-1144: emit column '" + name + "' has value of "
-                            + val + " but column can only have minimum value of " + Integer.MIN_VALUE);
-        }
-        else if (from instanceof Float) {
-            float val = (Float) from;
-            if (val > Integer.MAX_VALUE)
-                throw new ExaDataTypeException("E-UDF-CL-SL-JAVA-1145: emit column '" + name + "' has value of "
-                            + val + " but column can only have maximum value of " + Integer.MAX_VALUE);
-            if (val < Integer.MIN_VALUE)
-                throw new ExaDataTypeException("E-UDF-CL-SL-JAVA-1146: emit column '" + name + "' has value of "
-                            + val + " but column can only have minimum value of " + Integer.MIN_VALUE);
-            if (val != Math.floor(val))
-                throw new ExaDataTypeException("E-UDF-CL-SL-JAVA-1147: emit column '" + name + "' has a non-integer value of " + val);
-        }
-        else if (from instanceof Double) {
-            double val = (Double) from;
-            if (val > Integer.MAX_VALUE)
-                throw new ExaDataTypeException("E-UDF-CL-SL-JAVA-1148: emit column '" + name + "' has value of "
-                            + val + " but column can only have maximum value of " + Integer.MAX_VALUE);
-            if (val < Integer.MIN_VALUE)
-                throw new ExaDataTypeException("E-UDF-CL-SL-JAVA-1149: emit column '" + name + "' has value of "
-                            + val + " but column can only have minimum value of " + Integer.MIN_VALUE);
-            if (val != Math.floor(val))
-                throw new ExaDataTypeException("E-UDF-CL-SL-JAVA-1150: emit column '" + name + "' has a non-integer value of " + val);
-        }
-
-        return true;
-    }
-
-    private boolean isConversionToLongSafe(Object from, String name) throws ExaDataTypeException {
-        if (from == null)
-            return false;
-
-        if (from instanceof Float) {
-            float val = (Float) from;
-            if (val > Long.MAX_VALUE)
-                throw new ExaDataTypeException("E-UDF-CL-SL-JAVA-1151: emit column '" + name + "' has value of "
-                            + val + " but column can only have maximum value of " + Long.MAX_VALUE);
-            if (val < Long.MIN_VALUE)
-                throw new ExaDataTypeException("E-UDF-CL-SL-JAVA-1152: emit column '" + name + "' has value of "
-                            + val + " but column can only have minimum value of " + Long.MIN_VALUE);
-            if (val != Math.floor(val))
-                throw new ExaDataTypeException("E-UDF-CL-SL-JAVA-1153: emit column '" + name + "' has a non-integer value of " + val);
-        }
-        else if (from instanceof Double) {
-            double val = (Double) from;
-            if (val > Long.MAX_VALUE)
-                throw new ExaDataTypeException("E-UDF-CL-SL-JAVA-1154: emit column '" + name + "' has value of "
-                            + val + " but column can only have maximum value of " + Long.MAX_VALUE);
-            if (val < Long.MIN_VALUE)
-                throw new ExaDataTypeException("E-UDF-CL-SL-JAVA-1155: emit column '" + name + "' has value of "
-                            + val + " but column can only have minimum value of " + Long.MIN_VALUE);
-            if (val != Math.floor(val))
-                throw new ExaDataTypeException("E-UDF-CL-SL-JAVA-1156: emit column '" + name + "' has a non-integer value of " + val);
-        }
-
-        return true;
-    }
-
-    private void clearCache() {
-        for (int i = 0; i < cache.length; i++)
-            cache[i] = null;
-    }
-
-    void setInsideRun(boolean inside) {
-        insideRun = inside;
-    }
-
-    ExaIteratorImpl(ExaMetadata exaMetadata, TableIterator tableIterator, ResultHandler resultHandler) throws ExaIterationException {
-        this.exaMetadata = exaMetadata;
-        this.tableIterator = tableIterator;
-        this.resultHandler = resultHandler;
-
-        finished = false;
-        singleInput = this.exaMetadata.getInputType().equals("SCALAR") ? true : false;
-        singleOutput = this.exaMetadata.getOutputType().equals("RETURN") ? true : false;
-        insideRun = false;
-        cache = new Object[(int) this.exaMetadata.getInputColumnCount()];
-
-        Metadata tmp = new Metadata();
-        inputColumnTypes = new String[(int) this.exaMetadata.getInputColumnCount()];
-        for (int i = 0; i < inputColumnTypes.length; i++) {
-            inputColumnTypes[i] = tmp.inputColumnType(i).toString();
-        }
-        outputColumnTypes = new String[(int) this.exaMetadata.getOutputColumnCount()];
-        for (int i = 0; i < outputColumnTypes.length; i++) {
-            outputColumnTypes[i] = tmp.outputColumnType(i).toString();
-        }
-
-        columnNames = new ArrayList<String>();
-        for(int i = 0; i < this.exaMetadata.getInputColumnCount(); i++) {
-            columnNames.add(this.exaMetadata.getInputColumnName(i));
-        }
-    }
-}
diff --git a/exaudfclient/base/javacontainer/ExaMetadataImpl.java b/exaudfclient/base/javacontainer/ExaMetadataImpl.java
deleted file mode 100644
index 0681112..0000000
--- a/exaudfclient/base/javacontainer/ExaMetadataImpl.java
+++ /dev/null
@@ -1,305 +0,0 @@
-package com.exasol;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import com.exasol.swig.Metadata;
-import com.exasol.swig.ConnectionInformationWrapper;
-
-class ExaMetadataImpl implements ExaMetadata {
-    private Metadata metadata;
-
-    private String databaseName;
-    private String databaseVersion;
-    private String scriptLanguage;
-    private String scriptName;
-    private String currentUser;
-    private String scopeUser;
-    private String currentSchema;
-    private String scriptSchema;
-    private String scriptCode;
-    private String sessionId;
-    private long statementId;
-    private long nodeCount;
-    private long nodeId;
-    private String vmId;
-    private BigInteger memoryLimit;
-    private String inputType;
-    private long inputColumnCount;
-    private ColumnInfo[] inputColumns;
-    private String outputType;
-    private long outputColumnCount;
-    private ColumnInfo[] outputColumns;
-    private ArrayList<String> importedScripts;
-
-    @Override
-    public String getDatabaseName() { return databaseName; }
-    @Override
-    public String getDatabaseVersion() { return databaseVersion; }
-    @Override
-    public String getScriptLanguage() { return scriptLanguage; }
-    @Override
-    public String getScriptName() { return scriptName; }
-    @Override
-    public String getCurrentUser() { return currentUser; }
-    @Override
-    public String getScopeUser() { return scopeUser; }
-    @Override
-    public String getCurrentSchema() { return currentSchema; }
-    @Override
-    public String getScriptSchema() { return scriptSchema; }
-    @Override
-    public String getScriptCode() { return scriptCode; }
-    @Override
-    public String getSessionId() { return sessionId; }
-    @Override
-    public long getStatementId() { return statementId; }
-    @Override
-    public long getNodeCount() { return nodeCount; }
-    @Override
-    public long getNodeId() { return nodeId; }
-    @Override
-    public String getVmId() { return vmId; }
-    @Override
-    public BigInteger getMemoryLimit() { return memoryLimit; }
-    @Override
-    public String getInputType() { return inputType; }
-    @Override
-    public long getInputColumnCount() {return inputColumnCount; }
-    @Override
-    public String getInputColumnName(int column) throws ExaIterationException {
-        if (column < 0 || column >= inputColumns.length)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1083: Column number " + column + " does not exist");
-        return inputColumns[column].name;
-    }
-    @Override
-    public Class<?> getInputColumnType(int column) throws ExaIterationException {
-        if (column < 0 || column >= inputColumns.length)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1084: Column number " + column + " does not exist");
-        return inputColumns[column].type;
-    }
-    @Override
-    public String getInputColumnSqlType(int column) throws ExaIterationException {
-        if (column < 0 || column >= inputColumns.length)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1085: Column number " + column + " does not exist");
-        return inputColumns[column].sqlType;
-    }
-    @Override
-    public long getInputColumnPrecision(int column) throws ExaIterationException {
-        if (column < 0 || column >= inputColumns.length)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1086: Column number " + column + " does not exist");
-        return inputColumns[column].precision;
-    }
-    @Override
-    public long getInputColumnScale(int column) throws ExaIterationException {
-        if (column < 0 || column >= inputColumns.length)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1087: Column number " + column + " does not exist");
-        return inputColumns[column].scale;
-    }
-    @Override
-    public long getInputColumnLength(int column) throws ExaIterationException {
-        if (column < 0 || column >= inputColumns.length)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1088: Column number " + column + " does not exist");
-        return inputColumns[column].length;
-    }
-    @Override
-    public String getOutputType() { return outputType; }
-    @Override
-    public long getOutputColumnCount() { return outputColumnCount; }
-    @Override
-    public String getOutputColumnName(int column) throws ExaIterationException {
-        if (column < 0 || column >= outputColumns.length)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1089: Column number " + column + " does not exist");
-        return outputColumns[column].name;
-    }
-    @Override
-    public Class<?> getOutputColumnType(int column) throws ExaIterationException {
-        if (column < 0 || column >= outputColumns.length)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1090: Column number " + column + " does not exist");
-        return outputColumns[column].type;
-    }
-    @Override
-    public String getOutputColumnSqlType(int column) throws ExaIterationException {
-        if (column < 0 || column >= outputColumns.length)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1091: Column number " + column + " does not exist");
-        return outputColumns[column].sqlType;
-    }
-    @Override
-    public long getOutputColumnPrecision(int column) throws ExaIterationException {
-        if (column < 0 || column >= outputColumns.length)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1092: Column number " + column + " does not exist");
-        return outputColumns[column].precision;
-    }
-    @Override
-    public long getOutputColumnScale(int column) throws ExaIterationException {
-        if (column < 0 || column >= outputColumns.length)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1093: Column number " + column + " does not exist");
-        return outputColumns[column].scale;
-    }
-    @Override
-    public long getOutputColumnLength(int column) throws ExaIterationException {
-        if (column < 0 || column >= outputColumns.length)
-            throw new ExaIterationException("E-UDF-CL-SL-JAVA-1094: Column number " + column + " does not exist");
-        return outputColumns[column].length;
-    }
-    
-    @Override
-    public Class<?> importScript(String name) throws ExaCompilationException, ClassNotFoundException {
-        if (name == null)
-            throw new ExaCompilationException("F-UDF-CL-SL-JAVA-1095: Script name is null");
-        boolean isQuoted = (name.charAt(0) == '"' && name.charAt(name.length() - 1) == '"');
-        String scriptName = isQuoted ? name.substring(1, name.length() - 1) : name.toUpperCase();
-        if (!importedScripts.contains(scriptName)) {
-            String code = metadata.moduleContent(name);
-            code = "package com.exasol;\r\n" + code;
-            String exMsg = checkException();
-            if (exMsg != null && exMsg.length() > 0) {
-                throw new ExaCompilationException("F-UDF-CL-SL-JAVA-1096: "+exMsg);
-            }
-            try{
-                ExaCompiler.compile("com.exasol." + scriptName, code);
-            }catch(ExaCompilationException ex){
-                throw new ExaCompilationException("F-UDF-CL-SL-JAVA-1097: "+ex.toString());
-            }
-            importedScripts.add(scriptName);
-        }
-        return Class.forName("com.exasol." + scriptName);
-    }
-    
-    @Override
-    public ExaConnectionInformation getConnection(String name) throws ExaConnectionAccessException {
-        if (name == null) {
-            throw new ExaConnectionAccessException("E-UDF-CL-SL-JAVA-1098: Connection name is null");
-        }
-        boolean isQuoted = (name.charAt(0) == '"' && name.charAt(name.length() - 1) == '"');
-        String connectionName = isQuoted ? name.substring(1, name.length() - 1) : name.toUpperCase();
-        ConnectionInformationWrapper w = metadata.connectionInformation(connectionName);
-        String exMsg = checkException();
-        if (exMsg != null && exMsg.length() > 0) {
-            throw new ExaConnectionAccessException("E-UDF-CL-SL-JAVA-1099: "+exMsg);
-        }
-        return new ExaConnectionInformationImpl(w.copyKind(), w.copyAddress(), w.copyUser(), w.copyPassword());
-    }
-
-    public String checkException() {
-        return metadata.checkException();
-    }
-
-    ExaMetadataImpl() throws ClassNotFoundException, ExaDataTypeException {
-        metadata = new Metadata();
-
-        databaseName = metadata.databaseName();
-        databaseVersion = metadata.databaseVersion();
-        scriptLanguage = "Java " + System.getProperty("java.version");
-        scriptName = metadata.scriptName();
-        scriptSchema = metadata.scriptSchema();
-        currentUser = metadata.currentUser();
-        scopeUser = metadata.scopeUser();
-        currentSchema = metadata.currentSchema();
-        scriptCode = metadata.scriptCode();
-        sessionId = metadata.sessionID_S();
-        statementId = metadata.statementID();
-        nodeCount = metadata.nodeCount();
-        nodeId = metadata.nodeID();
-        vmId = metadata.vmID_S();
-        memoryLimit = metadata.memoryLimit();
-
-        inputType = (metadata.inputType().toString().equals("EXACTLY_ONCE")) ? "SCALAR" : "SET";
-        inputColumnCount = metadata.inputColumnCount();
-        inputColumns = new ColumnInfo[(int) inputColumnCount];
-        for (int i = 0; i < inputColumns.length; i++) {
-            inputColumns[i] = new ColumnInfo();
-            inputColumns[i].initInputColumnInfo(i);
-        }
-
-        outputType = (metadata.outputType().toString().equals("EXACTLY_ONCE")) ? "RETURN" : "EMIT";
-        outputColumnCount = metadata.outputColumnCount();
-        outputColumns = new ColumnInfo[(int) outputColumnCount];
-        for (int i = 0; i < outputColumns.length; i++) {
-            outputColumns[i] = new ColumnInfo();
-            outputColumns[i].initOutputColumnInfo(i);
-        }
-
-        importedScripts = new ArrayList<String>();
-    }
-
-    private class ColumnInfo {
-        private String name;
-        private String exaType;
-        private Class type;
-        private String sqlType;
-        private long precision;
-        private long scale;
-        private long length;
-
-        private void initInputColumnInfo(long column) throws ClassNotFoundException, ExaDataTypeException {
-            name = metadata.inputColumnName(column);
-            exaType = metadata.inputColumnType(column).toString();
-            sqlType = metadata.inputColumnTypeName(column);
-            precision = metadata.inputColumnPrecision(column);
-            scale = metadata.inputColumnScale(column);
-            length = metadata.inputColumnSize(column);
-            setColumnInfo();
-        }
-
-        private void initOutputColumnInfo(long column) throws ClassNotFoundException, ExaDataTypeException {
-            name = metadata.outputColumnName(column);
-            exaType = metadata.outputColumnType(column).toString();
-            sqlType = metadata.outputColumnTypeName(column);
-            precision = metadata.outputColumnPrecision(column);
-            scale = metadata.outputColumnScale(column);
-            length = metadata.outputColumnSize(column);
-            setColumnInfo();
-
-        }
-
-        private void setColumnInfo() throws ClassNotFoundException, ExaDataTypeException {
-            switch(exaType) {
-                case "INT32":
-                    type = Class.forName("java.lang.Integer");
-                    scale = 0;
-                    length = 0;
-                    break;
-                case "INT64":
-                    type = Class.forName("java.lang.Long");
-                    scale = 0;
-                    length = 0;
-                    break;
-                case "NUMERIC":
-                    type = Class.forName("java.math.BigDecimal");
-                    length = 0;
-                    break;
-                case "DOUBLE":
-                    type = Class.forName("java.lang.Double");
-                    precision = 0;
-                    scale = 0;
-                    length = 0;
-                    break;
-                case "STRING":
-                    type = Class.forName("java.lang.String");
-                    precision = 0;
-                    scale = 0;
-                    break;
-                case "BOOLEAN":
-                    type = Class.forName("java.lang.Boolean");
-                    precision = 0;
-                    scale = 0;
-                    length = 0;
-                    break;
-                case "DATE":
-                    type = Class.forName("java.sql.Date");
-                    precision = 0;
-                    scale = 0;
-                    length = 0;
-                    break;
-                case "TIMESTAMP":
-                    type = Class.forName("java.sql.Timestamp");
-                    precision = 0;
-                    scale = 0;
-                    length = 0;
-                    break;
-                default:
-                    throw new ExaDataTypeException("F-UDF-CL-SL-JAVA-1100: data type " + exaType + " is not supported");
-            }
-        }
-    }
-}
diff --git a/exaudfclient/base/javacontainer/ExaStackTraceCleaner.java b/exaudfclient/base/javacontainer/ExaStackTraceCleaner.java
deleted file mode 100644
index 58559c3..0000000
--- a/exaudfclient/base/javacontainer/ExaStackTraceCleaner.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.exasol;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.MalformedParameterizedTypeException;
-import java.lang.reflect.Method;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.io.StringWriter;
-import java.io.PrintWriter;
-import java.util.LinkedList;
-import java.util.ListIterator;
-import java.util.Arrays;
-
-class ExaStackTraceCleaner {
-
-    public ExaStackTraceCleaner(final String triggerClassName)  {
-        mTriggerClassName = triggerClassName;
-    }
-
-    public String cleanStackTrace(final Throwable src) {
-        final Throwable th = unpack(src);
-        cleanExceptionChain(th);
-        return format(th);
-    }
-
-    private Throwable unpack(final Throwable src) {
-        Throwable exc = src;
-        while (exc != null && (exc instanceof InvocationTargetException ||
-                    exc instanceof MalformedParameterizedTypeException ||
-                    exc instanceof UndeclaredThrowableException)) {
-            Throwable cause = exc.getCause();
-            if (cause == null)
-                break;
-            else
-                exc = cause;
-        }
-        return exc;
-    }
-
-    private String format(final Throwable src) {
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        src.printStackTrace(pw);
-        String stacktrace = sw.toString();
-        LinkedList<String> stacktrace_lines = new LinkedList<String>(Arrays.asList(stacktrace.split("\\r?\\n")));
-
-        ListIterator list_Iter = stacktrace_lines.listIterator(0);
-        StringWriter stringWriter = new StringWriter();
-        PrintWriter writer = new PrintWriter(stringWriter, true);
-        while (list_Iter.hasNext()) {
-            String line = (String) list_Iter.next();
-            writer.println(line.replaceFirst("^\tat ", ""));
-        }
-        String cleanedStacktrace = stringWriter.toString();
-        return cleanedStacktrace;
-    }
-
-    private void cleanExceptionChain(final Throwable src) {
-        StackTraceElement[] stackTraceElements = src.getStackTrace();
-        Integer start_index = null;
-        LinkedList<StackTraceElement> newStackTrace = new LinkedList<>();
-
-        if (stackTraceElements.length > 0) {
-            for (int idxStackTraceElement = (stackTraceElements.length - 1); idxStackTraceElement >= 0; idxStackTraceElement--) {
-                StackTraceElement stackTraceElement = stackTraceElements[idxStackTraceElement];
-                boolean addStackTrace = true;
-                if (stackTraceElement.getClassName().equals(mTriggerClassName)) {
-                    if (start_index == null) {
-                        start_index = idxStackTraceElement;
-                    }
-                } else if ("java.base".equals(stackTraceElement.getModuleName())) {
-                    if (start_index != null &&
-                            (stackTraceElement.getClassName().startsWith("jdk.internal.reflect") ||
-                                    stackTraceElement.getClassName().startsWith("java.lang.reflect"))) {
-                        addStackTrace = false;
-                    }
-                } else {
-                    start_index = null;
-                }
-                if (addStackTrace) {
-                    newStackTrace.add(0, stackTraceElement);
-                }
-            }
-            StackTraceElement[] newArr = new StackTraceElement[newStackTrace.size()];
-            newArr = newStackTrace.toArray(newArr);
-            src.setStackTrace(newArr);
-        }
-        if (src.getCause() != null) {
-            cleanExceptionChain(src.getCause());
-        }
-    }
-
-    private final String mTriggerClassName;
-}
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/ExaUndefinedSingleCallException.java b/exaudfclient/base/javacontainer/ExaUndefinedSingleCallException.java
deleted file mode 100644
index 5bdab65..0000000
--- a/exaudfclient/base/javacontainer/ExaUndefinedSingleCallException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.exasol;
-
-/**
- * This class is not part of the public Java UDF API
- */
-public class ExaUndefinedSingleCallException extends Exception {
-    private static final long serialVersionUID = 1L;
-    public ExaUndefinedSingleCallException(String undefinedRemoteFn) {
-        super("Undefined single call fn: "+undefinedRemoteFn);
-        this.undefinedRemoteFn = undefinedRemoteFn;
-    }
-    public String getUndefinedRemoteFn() {
-        return undefinedRemoteFn;
-    }
-    private String undefinedRemoteFn;
-}
diff --git a/exaudfclient/base/javacontainer/ExaWrapper.java b/exaudfclient/base/javacontainer/ExaWrapper.java
deleted file mode 100644
index c881fdd..0000000
--- a/exaudfclient/base/javacontainer/ExaWrapper.java
+++ /dev/null
@@ -1,273 +0,0 @@
-package com.exasol;
-
-import java.io.IOError;
-import java.io.StringWriter;
-import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.MalformedParameterizedTypeException;
-import java.lang.reflect.Method;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.ListIterator;
-import java.util.List;
-import java.util.Map;
-import java.util.ArrayList;
-import java.util.HashMap;
-import com.exasol.swig.ResultHandler;
-import com.exasol.swig.TableIterator;
-import com.exasol.swig.ImportSpecificationWrapper;
-import com.exasol.swig.ExportSpecificationWrapper;
-import com.exasol.swig.ConnectionInformationWrapper;
-import com.exasol.ExaStackTraceCleaner;
-
-class ExaWrapper {
-    static byte[] runSingleCall(String fn, Object args) throws Throwable {
-    Class argClass = Object.class;
-        if (args != null) {
-             if (args instanceof ImportSpecificationWrapper) {
-                 ImportSpecificationWrapper is = (ImportSpecificationWrapper)args;
-                 List<String> columnNames = new ArrayList<String>();
-                 List<String> columnTypes = new ArrayList<String>();
-                 if (is.isSubselect()) {
-                     for (int i=0; i<is.numSubselectColumns(); i++) {                         
-                         columnNames.add(is.copySubselectColumnName(i));
-                         columnTypes.add(is.copySubselectColumnType(i));
-                     }
-                 }
-                 Map<String,String> parameters = new HashMap<String,String>();
-                 for (int i=0; i<is.getNumberOfParameters(); i++) {
-                     parameters.put(is.copyKey(i),is.copyValue(i));
-                 }
-                 ConnectionInformationWrapper w = is.hasConnectionInformation()?is.getConnectionInformation():null;
-
-                 args = new ExaImportSpecificationImpl(is.isSubselect(),
-                                                       columnNames,
-                                                       columnTypes,
-                                                       is.hasConnectionName()?is.copyConnectionName():null,
-                                                       (w!=null)?new ExaConnectionInformationImpl(w.copyKind(), w.copyAddress(), w.copyUser(), w.copyPassword()):null,
-                                                       parameters);
-                 argClass = ExaImportSpecification.class;
-             } else if (args instanceof ExportSpecificationWrapper) {
-                 ExportSpecificationWrapper es = (ExportSpecificationWrapper)args;
-                 Map<String,String> parameters = new HashMap<String,String>();
-                 for (int i=0; i<es.getNumberOfParameters(); i++) {
-                     parameters.put(es.copyKey(i),es.copyValue(i));
-                 }
-                 ConnectionInformationWrapper w = es.hasConnectionInformation()?es.getConnectionInformation():null;
-                 List<String> sourceColumnNames = new ArrayList<String>();
-                 for (int i=0; i<es.numSourceColumns(); i++) {
-                     sourceColumnNames.add(es.copySourceColumnName(i));
-                 }
-
-                 args = new ExaExportSpecificationImpl(es.hasConnectionName()?es.copyConnectionName():null,
-                                                       (w!=null)?new ExaConnectionInformationImpl(w.copyKind(), w.copyAddress(), w.copyUser(), w.copyPassword()):null,
-                                                       parameters,
-                                                       es.hasTruncate(), es.hasReplace(),
-                                                       es.copyCreatedBy(), sourceColumnNames);
-                 argClass = ExaExportSpecification.class;
-             } else if (fn.equals("adapterCall")) { // TODO VS This will be refactored completely soon
-                 // args is already a String with the String arg, so nothing to do
-                 argClass = String.class;
-             } else {
-                 throw new ExaCompilationException("F-UDF-CL-SL-JAVA-1065: Internal error: single call argument with unknown DTO: " + args.toString());
-             }
-        }
-
-        ExaMetadataImpl exaMetadata = new ExaMetadataImpl();
-        String exMsg = exaMetadata.checkException();
-        if (exMsg != null && exMsg.length() > 0) {
-            throw new ExaIterationException("UDF.CL.SL.JAVA-1161: "+exMsg);
-        }
-        // Take the scriptClass name specified by user in the script, or the name of the script as fallback
-        boolean userDefinedScriptName = true;
-        String scriptClassName = System.getProperty("exasol.scriptclass", "");
-        if (scriptClassName.trim().isEmpty()) {
-            userDefinedScriptName = false;
-            scriptClassName = exaMetadata.getScriptName();
-            scriptClassName = scriptClassName.replace('.', '_');  // ** see comment in run() method
-            scriptClassName = "com.exasol." + scriptClassName;
-        }
-        try {
-            Class<?> scriptClass = Class.forName(scriptClassName);
-            if (args == null) {
-                Class[] params = {ExaMetadata.class};
-                Method method = scriptClass.getDeclaredMethod(fn, params);
-                String resS = String.valueOf(method.invoke(null, exaMetadata));
-                return resS.getBytes("UTF-8");
-            } else {
-                Class[] params = {ExaMetadata.class,argClass};
-                Method method = scriptClass.getDeclaredMethod(fn, params);
-                String resS = String.valueOf(method.invoke(null, exaMetadata, args));
-                return resS.getBytes("UTF-8");
-            }
-        } catch (java.lang.ClassNotFoundException ex) {
-            if (userDefinedScriptName) {
-                throw new ExaCompilationException("F-UDF-CL-SL-JAVA-1066: The main script class defined via %scriptclass cannot be found: " + scriptClassName);
-            } else {
-                throw new ExaCompilationException("F-UDF-CL-SL-JAVA-1067: The main script class (same name as the script) cannot be found: " + scriptClassName + ". Please create the class or specify the class via %scriptclass.");
-            }
-        } catch (InvocationTargetException ex) {
-              throw convertReflectiveExceptionToCause("F-UDF-CL-SL-JAVA-1068","Exception during singleCall "+fn,ex);
-        } catch (NoSuchMethodException ex) {
-           throw new ExaUndefinedSingleCallException(fn);
-        }
-    }
-
-    static Class<?> getScriptClass(ExaMetadataImpl exaMetadata) throws Throwable {
-        boolean userDefinedScriptName = true;
-        String scriptClassName = System.getProperty("exasol.scriptclass", "");
-        if (scriptClassName.trim().isEmpty()) {
-            userDefinedScriptName = false;
-            scriptClassName = exaMetadata.getScriptName();
-            // Only for test simulator (e.g., script.java -> script_java)
-            scriptClassName = scriptClassName.replace('.', '_');
-            scriptClassName = "com.exasol." + scriptClassName;
-        }
-        try{
-            // Take the scriptClass name specified by user in the script, or the name of the script as fallback
-            Class<?> scriptClass = Class.forName(scriptClassName);
-            return scriptClass;
-        } catch (java.lang.ClassNotFoundException ex) {
-            if (userDefinedScriptName) {
-                throw new ExaCompilationException("F-UDF.CL.SL.JAVA-1072: The main script class defined via %scriptclass cannot be found: " + scriptClassName);
-            } else {
-                throw new ExaCompilationException("F-UDF.CL.SL.JAVA-1073: The main script class (same name as the script) cannot be found: " + scriptClassName + ". Please create the class or specify the class via %scriptclass.");
-            }
-        }
-    }
-
-  
-    static ExaMetadataImpl getMetaData() throws Throwable {
-        ExaMetadataImpl exaMetadata = new ExaMetadataImpl();
-        String exMsg = exaMetadata.checkException();
-        if (exMsg != null && exMsg.length() > 0) {
-            throw new ExaIterationException("UDF.CL.SL.JAVA-1165: "+exMsg);
-        }
-        return exaMetadata;
-    }
-
-    static void run() throws Throwable {
-        ExaMetadataImpl exaMetadata = null;
-        try{
-            exaMetadata = getMetaData();
-        }catch(ExaIterationException ex){
-            throw new ExaIterationException("F-UDF.CL.SL.JAVA-1069: "+ex.getMessage());
-        }
-        TableIterator tableIterator = new TableIterator();
-        String exMsg = tableIterator.checkException();
-        if (exMsg != null && exMsg.length() > 0) {
-            throw new ExaIterationException("F-UDF-CL-SL-JAVA-1070: "+exMsg);
-        }
-        ResultHandler resultHandler = new ResultHandler(tableIterator);
-        exMsg = resultHandler.checkException();
-        if (exMsg != null && exMsg.length() > 0) {
-            throw new ExaIterationException("F-UDF-CL-SL-JAVA-1071: "+exMsg);
-        }
-
-        ExaIteratorImpl exaIter = new ExaIteratorImpl(exaMetadata, tableIterator, resultHandler);
-
-        Class<?> scriptClass = null;
-        try {
-            scriptClass = getScriptClass(exaMetadata);
-        } catch (ExaCompilationException ex){
-            throw new ExaCompilationException("F-UDF.CL.SL.JAVA-1165: "+ex.getMessage());
-        }
-        // init()
-        try {
-            Class[] initParams = {ExaMetadata.class};
-            Method initMethod = scriptClass.getDeclaredMethod("init", initParams);
-            initMethod.invoke(null, exaMetadata);
-        } catch (InvocationTargetException ex) {
-            throw convertReflectiveExceptionToCause("F-UDF-CL-SL-JAVA-1074","Exception during init",ex);
-        } catch (NoSuchMethodException ex) { 
-            System.err.println("W-UDF-CL-SL-JAVA-1075: Skipping init, because init method cannot be found.");
-        }
-
-        // run()
-        Class[] runParams = {ExaMetadata.class, ExaIterator.class};
-        Method runMethod = scriptClass.getDeclaredMethod("run", runParams);
-
-        try {
-            if (exaMetadata.getInputType().equals("SET")) { // MULTIPLE INPUT
-                if (exaMetadata.getOutputType().equals("EMIT")) { // MULTIPLE OUTPUT
-                    if (!runMethod.getReturnType().equals(Void.TYPE))
-                        throw new ExaCompilationException("F-UDF-CL-SL-JAVA-1076: EMITS requires a void return type for run()");
-                    exaIter.setInsideRun(true);
-                    Object returnValue = runMethod.invoke(null, exaMetadata, exaIter);
-                    exaIter.setInsideRun(false);
-                }
-                else { // EXACTLY_ONCE OUTPUT
-                    if (runMethod.getReturnType().equals(Void.TYPE))
-                        throw new ExaCompilationException("F-UDF-CL-SL-JAVA-1077: RETURNS requires a non-void return type for run()");
-                    exaIter.setInsideRun(true);
-                    Object returnValue = runMethod.invoke(null, exaMetadata, exaIter);
-                    exaIter.setInsideRun(false);
-                    exaIter.emit(returnValue);
-                }
-            }
-            else { // EXACTLY_ONCE INPUT
-                if (exaMetadata.getOutputType().equals("EMIT")) { // MULTIPLE OUTPUT
-                    if (!runMethod.getReturnType().equals(Void.TYPE))
-                        throw new ExaCompilationException("F-UDF-CL-SL-JAVA-1078: EMITS requires a void return type for run()");
-                    do {
-                        exaIter.setInsideRun(true);
-                        Object returnValue = runMethod.invoke(null, exaMetadata, exaIter);
-                        exaIter.setInsideRun(false);
-                    } while (exaIter.next());
-                }
-                else { // EXACTLY_ONCE OUTPUT
-                    if (runMethod.getReturnType().equals(Void.TYPE))
-                        throw new ExaCompilationException("F-UDF-CL-SL-JAVA-1079: RETURNS requires a non-void return type for run()");
-                    do {
-                        exaIter.setInsideRun(true);
-                        Object returnValue = runMethod.invoke(null, exaMetadata, exaIter);
-                        exaIter.setInsideRun(false);
-                        exaIter.emit(returnValue);
-                    } while (exaIter.next());
-                }
-            }
-        }
-        catch (InvocationTargetException ex) {
-            throw convertReflectiveExceptionToCause("F-UDF-CL-SL-JAVA-1080","Exception during run",ex);
-        }
-
-        resultHandler.flush();
-    }
-
-    static void cleanup() throws Throwable {
-        // FIXME cleanup gets only called if run is successful
-        // cleanup()
-        ExaMetadataImpl exaMetadata = null;
-        try{
-            exaMetadata = getMetaData();
-        }catch(ExaIterationException ex){
-            throw new ExaIterationException("F-UDF.CL.SL.JAVA-1166: "+ex.getMessage());
-        }
-        Class<?> scriptClass = null;
-        try {
-            scriptClass = getScriptClass(exaMetadata);
-        } catch (ExaCompilationException ex){
-            throw new ExaCompilationException("F-UDF.CL.SL.JAVA-1167: "+ex.getMessage());
-        }
-        try {
-            Class[] cleanupParams = {ExaMetadata.class};
-            Method cleanupMethod = scriptClass.getDeclaredMethod("cleanup", cleanupParams);
-            cleanupMethod.invoke(null, exaMetadata);
-        }
-        catch (InvocationTargetException ex) {
-            throw convertReflectiveExceptionToCause("F-UDF-CL-SL-JAVA-1081","Exception during cleanup",ex);
-        }
-        catch (NoSuchMethodException ex) {
-            System.err.println("W-UDF.CL.SL.JAVA-1082: Skipping cleanup, because cleanup method cannot be found.");
-        }
-    }
-
-    private static Throwable convertReflectiveExceptionToCause(String error_code, String errorMessage, Throwable ex) {
-        ExaStackTraceCleaner exaStackTraceCleaner = new ExaStackTraceCleaner(ExaWrapper.class.getName());
-        String cleanedStacktrace = exaStackTraceCleaner.cleanStackTrace(ex);
-        String error_message=error_code+": "+errorMessage+" \n"+cleanedStacktrace;
-        System.out.println(error_message);
-        return new ExaUDFException(error_message);
-    }
-}
diff --git a/exaudfclient/base/javacontainer/exascript_java_jni_decl.h b/exaudfclient/base/javacontainer/exascript_java_jni_decl.h
deleted file mode 100644
index 022e4c9..0000000
--- a/exaudfclient/base/javacontainer/exascript_java_jni_decl.h
+++ /dev/null
@@ -1,261 +0,0 @@
-#ifndef EXASCRIPT_JAVA_JNI_DECL_H
-#define EXASCRIPT_JAVA_JNI_DECL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-// the signature definitions can be printed with 'javah -classpath . com.exasol.swig.exascript_javaJNI'
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_ConnectionInformationWrapper_1copyKind(JNIEnv *, jclass, jlong, jobject);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_ConnectionInformationWrapper_1copyAddress(JNIEnv *, jclass, jlong, jobject);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_ConnectionInformationWrapper_1copyUser(JNIEnv *, jclass, jlong, jobject);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_ConnectionInformationWrapper_1copyPassword(JNIEnv *, jclass, jlong, jobject);
-
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_new_1ImportSpecificationWrapper(JNIEnv *jenv, jclass, jlong);
-jboolean JNICALL Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1isSubselect(JNIEnv *, jclass, jlong, jobject);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1numSubselectColumns(JNIEnv *, jclass, jlong, jobject);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1copySubselectColumnName(JNIEnv *, jclass, jlong, jobject, jlong);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1copySubselectColumnType(JNIEnv *, jclass, jlong, jobject, jlong);
-jboolean JNICALL Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1hasConnectionName(JNIEnv *, jclass, jlong, jobject);
-jboolean JNICALL Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1hasConnectionInformation(JNIEnv *, jclass, jlong, jobject);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1copyConnectionName(JNIEnv *, jclass, jlong, jobject);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1getConnectionInformation(JNIEnv *, jclass, jlong, jobject);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1getNumberOfParameters(JNIEnv *, jclass, jlong, jobject);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1copyKey(JNIEnv *, jclass, jlong, jobject, jlong);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1copyValue(JNIEnv *, jclass, jlong, jobject, jlong);
-
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_new_1ExportSpecificationWrapper(JNIEnv *, jclass, jlong);
-jboolean JNICALL Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1hasConnectionName(JNIEnv *, jclass, jlong, jobject);
-jboolean JNICALL Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1hasConnectionInformation(JNIEnv *, jclass, jlong, jobject);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1copyConnectionName(JNIEnv *, jclass, jlong, jobject);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1getConnectionInformation(JNIEnv *, jclass, jlong, jobject);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1getNumberOfParameters(JNIEnv *, jclass, jlong, jobject);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1copyKey(JNIEnv *, jclass, jlong, jobject, jlong);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1copyValue(JNIEnv *, jclass, jlong, jobject, jlong);
-jboolean JNICALL Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1hasTruncate(JNIEnv *, jclass, jlong, jobject);
-jboolean JNICALL Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1hasReplace(JNIEnv *, jclass, jlong, jobject);
-jboolean JNICALL Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1hasCreatedBy(JNIEnv *, jclass, jlong, jobject);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1copyCreatedBy(JNIEnv *, jclass, jlong, jobject);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1numSourceColumns(JNIEnv *, jclass, jlong, jobject);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1copySourceColumnName(JNIEnv *, jclass, jlong, jobject, jlong);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_delete_1ExportSpecificationWrapper(JNIEnv *, jclass, jlong);
-
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_UNSUPPORTED_1get(JNIEnv *jenv, jclass jcls);
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_DOUBLE_1get(JNIEnv *jenv, jclass jcls);
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_INT32_1get(JNIEnv *jenv, jclass jcls);
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_INT64_1get(JNIEnv *jenv, jclass jcls);
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_NUMERIC_1get(JNIEnv *jenv, jclass jcls);
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_TIMESTAMP_1get(JNIEnv *jenv, jclass jcls);
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_DATE_1get(JNIEnv *jenv, jclass jcls);
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_STRING_1get(JNIEnv *jenv, jclass jcls);
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_BOOLEAN_1get(JNIEnv *jenv, jclass jcls);
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_EXACTLY_1ONCE_1get(JNIEnv *jenv, jclass jcls);
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_MULTIPLE_1get(JNIEnv *jenv, jclass jcls);
-
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_new_1Metadata(JNIEnv *jenv, jclass jcls);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1databaseName(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1databaseVersion(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1scriptName(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1scriptSchema(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1currentUser(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1scopeUser(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1currentSchema(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1scriptCode(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1moduleContent(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2);
-jobject JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1connectionInformation(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2);
-jobject JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1sessionID(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1sessionID_1S(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1statementID(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1nodeCount(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1nodeID(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jobject JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1vmID(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1vmID_1S(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jobject JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1memoryLimit(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputColumnCount(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputColumnName(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputColumnType(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputColumnTypeName(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputColumnSize(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputColumnPrecision(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputColumnScale(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputType(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputColumnCount(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputColumnName(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputColumnType(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputColumnTypeName(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputColumnSize(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputColumnPrecision(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputColumnScale(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputType(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_Metadata_1checkException(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_delete_1Metadata(JNIEnv *jenv, jclass jcls, jlong jarg1);
-
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_new_1TableIterator(JNIEnv *jenv, jclass jcls);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1checkException(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1reinitialize(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jboolean JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1next(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jboolean JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1eot(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1reset(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1restBufferSize(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1rowsInGroup(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1rowsCompleted(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jdouble JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getDouble(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jbyteArray JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getStringByteArray(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jint JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getInt32(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getInt64(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getNumeric(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getDate(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getTimestamp(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jboolean JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getBoolean(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-jboolean JNICALL Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1wasNull(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_delete_1TableIterator(JNIEnv *jenv, jclass jcls, jlong jarg1);
-
-jlong JNICALL Java_com_exasol_swig_exascript_1javaJNI_new_1ResultHandler(JNIEnv *jenv, jclass jcls);
-jstring JNICALL Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1checkException(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1reinitialize(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-jboolean JNICALL Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1next(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1flush(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setDouble(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jdouble jarg3);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setStringByteArray(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jbyteArray jarg3, jlong jarg4);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setInt32(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jint jarg3);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setInt64(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jlong jarg3);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setNumeric(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jstring jarg3);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setDate(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jstring jarg3);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setTimestamp(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jstring jarg3);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setBoolean(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jboolean jarg3);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setNull(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2);
-void JNICALL Java_com_exasol_swig_exascript_1javaJNI_delete_1ResultHandler(JNIEnv *jenv, jclass jcls, jlong jarg1);
-
-// This array is a mapping from the native java methods in exascript_javaJNI class to 
-// The signature syntax can be printed via "javap -s -p exascript_javaJNI" in the folder containing the exascript_javaJNI.class
-JNINativeMethod methods[] = {
-    {(char *)"UNSUPPORTED_get", (char *)"()I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_UNSUPPORTED_1get},
-    {(char *)"DOUBLE_get", (char *)"()I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_DOUBLE_1get},
-    {(char *)"INT32_get", (char *)"()I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_INT32_1get},
-    {(char *)"INT64_get", (char *)"()I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_INT64_1get},
-    {(char *)"NUMERIC_get", (char *)"()I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_NUMERIC_1get},
-    {(char *)"TIMESTAMP_get", (char *)"()I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TIMESTAMP_1get},
-    {(char *)"DATE_get", (char *)"()I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_DATE_1get},
-    {(char *)"STRING_get", (char *)"()I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_STRING_1get},
-    {(char *)"BOOLEAN_get", (char *)"()I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_BOOLEAN_1get},
-    {(char *)"EXACTLY_ONCE_get", (char *)"()I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_EXACTLY_1ONCE_1get},
-    {(char *)"MULTIPLE_get", (char *)"()I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_MULTIPLE_1get},
-    {(char *)"new_Metadata", (char *)"()J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_new_1Metadata},
-    {(char *)"Metadata_databaseName", (char *)"(JLcom/exasol/swig/Metadata;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1databaseName},
-    {(char *)"Metadata_databaseVersion", (char *)"(JLcom/exasol/swig/Metadata;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1databaseVersion},
-    {(char *)"Metadata_scriptName", (char *)"(JLcom/exasol/swig/Metadata;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1scriptName},
-    {(char *)"Metadata_scriptSchema", (char *)"(JLcom/exasol/swig/Metadata;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1scriptSchema},
-    {(char *)"Metadata_currentUser", (char *)"(JLcom/exasol/swig/Metadata;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1currentUser},
-    {(char *)"Metadata_scopeUser", (char *)"(JLcom/exasol/swig/Metadata;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1scopeUser},
-    {(char *)"Metadata_currentSchema", (char *)"(JLcom/exasol/swig/Metadata;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1currentSchema},
-    {(char *)"Metadata_scriptCode", (char *)"(JLcom/exasol/swig/Metadata;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1scriptCode},
-    {(char *)"Metadata_moduleContent", (char *)"(JLcom/exasol/swig/Metadata;Ljava/lang/String;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1moduleContent},
-    {(char *)"Metadata_connectionInformation", (char *)"(JLcom/exasol/swig/Metadata;Ljava/lang/String;)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1connectionInformation},
-    {(char *)"Metadata_sessionID", (char *)"(JLcom/exasol/swig/Metadata;)Ljava/math/BigInteger;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1sessionID},
-    {(char *)"Metadata_sessionID_S", (char *)"(JLcom/exasol/swig/Metadata;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1sessionID_1S},
-    {(char *)"Metadata_statementID", (char *)"(JLcom/exasol/swig/Metadata;)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1statementID},
-    {(char *)"Metadata_nodeCount", (char *)"(JLcom/exasol/swig/Metadata;)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1nodeCount},
-    {(char *)"Metadata_nodeID", (char *)"(JLcom/exasol/swig/Metadata;)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1nodeID},
-    {(char *)"Metadata_vmID", (char *)"(JLcom/exasol/swig/Metadata;)Ljava/math/BigInteger;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1vmID},
-    {(char *)"Metadata_vmID_S", (char *)"(JLcom/exasol/swig/Metadata;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1vmID_1S},
-    {(char *)"Metadata_memoryLimit", (char *)"(JLcom/exasol/swig/Metadata;)Ljava/math/BigInteger;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1memoryLimit},
-    {(char *)"Metadata_inputColumnCount", (char *)"(JLcom/exasol/swig/Metadata;)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputColumnCount},
-    {(char *)"Metadata_inputColumnName", (char *)"(JLcom/exasol/swig/Metadata;J)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputColumnName},
-    {(char *)"Metadata_inputColumnType", (char *)"(JLcom/exasol/swig/Metadata;J)I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputColumnType},
-    {(char *)"Metadata_inputColumnTypeName", (char *)"(JLcom/exasol/swig/Metadata;J)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputColumnTypeName},
-    {(char *)"Metadata_inputColumnSize", (char *)"(JLcom/exasol/swig/Metadata;J)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputColumnSize},
-    {(char *)"Metadata_inputColumnPrecision", (char *)"(JLcom/exasol/swig/Metadata;J)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputColumnPrecision},
-    {(char *)"Metadata_inputColumnScale", (char *)"(JLcom/exasol/swig/Metadata;J)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputColumnScale},
-    {(char *)"Metadata_inputType", (char *)"(JLcom/exasol/swig/Metadata;)I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1inputType},
-    {(char *)"Metadata_outputColumnCount", (char *)"(JLcom/exasol/swig/Metadata;)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputColumnCount},
-    {(char *)"Metadata_outputColumnName", (char *)"(JLcom/exasol/swig/Metadata;J)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputColumnName},
-    {(char *)"Metadata_outputColumnType", (char *)"(JLcom/exasol/swig/Metadata;J)I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputColumnType},
-    {(char *)"Metadata_outputColumnTypeName", (char *)"(JLcom/exasol/swig/Metadata;J)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputColumnTypeName},
-    {(char *)"Metadata_outputColumnSize", (char *)"(JLcom/exasol/swig/Metadata;J)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputColumnSize},
-    {(char *)"Metadata_outputColumnPrecision", (char *)"(JLcom/exasol/swig/Metadata;J)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputColumnPrecision},
-    {(char *)"Metadata_outputColumnScale", (char *)"(JLcom/exasol/swig/Metadata;J)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputColumnScale},
-    {(char *)"Metadata_outputType", (char *)"(JLcom/exasol/swig/Metadata;)I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1outputType},
-    {(char *)"Metadata_checkException", (char *)"(JLcom/exasol/swig/Metadata;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_Metadata_1checkException},
-    {(char *)"delete_Metadata", (char *)"(J)V", (void *)&JNICALL Java_com_exasol_swig_exascript_1javaJNI_delete_1Metadata},
-
-    {(char *)"new_TableIterator", (char *)"()J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_new_1TableIterator},
-    {(char *)"TableIterator_checkException", (char *)"(JLcom/exasol/swig/TableIterator;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1checkException},
-    {(char *)"TableIterator_reinitialize", (char *)"(JLcom/exasol/swig/TableIterator;)V", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1reinitialize},
-    {(char *)"TableIterator_next", (char *)"(JLcom/exasol/swig/TableIterator;)Z", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1next},
-    {(char *)"TableIterator_eot", (char *)"(JLcom/exasol/swig/TableIterator;)Z", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1eot},
-    {(char *)"TableIterator_reset", (char *)"(JLcom/exasol/swig/TableIterator;)V", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1reset},
-    {(char *)"TableIterator_restBufferSize", (char *)"(JLcom/exasol/swig/TableIterator;)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1restBufferSize},
-    {(char *)"TableIterator_rowsInGroup", (char *)"(JLcom/exasol/swig/TableIterator;)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1rowsInGroup},
-    {(char *)"TableIterator_rowsCompleted", (char *)"(JLcom/exasol/swig/TableIterator;)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1rowsCompleted},
-    {(char *)"TableIterator_getDouble", (char *)"(JLcom/exasol/swig/TableIterator;J)D", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getDouble},
-    {(char *)"TableIterator_getStringByteArray", (char *)"(JLcom/exasol/swig/TableIterator;J)[B", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getStringByteArray},
-    {(char *)"TableIterator_getInt32", (char *)"(JLcom/exasol/swig/TableIterator;J)I", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getInt32},
-    {(char *)"TableIterator_getInt64", (char *)"(JLcom/exasol/swig/TableIterator;J)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getInt64},
-    {(char *)"TableIterator_getNumeric", (char *)"(JLcom/exasol/swig/TableIterator;J)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getNumeric},
-    {(char *)"TableIterator_getDate", (char *)"(JLcom/exasol/swig/TableIterator;J)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getDate},
-    {(char *)"TableIterator_getTimestamp", (char *)"(JLcom/exasol/swig/TableIterator;J)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getTimestamp},
-    {(char *)"TableIterator_getBoolean", (char *)"(JLcom/exasol/swig/TableIterator;J)Z", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1getBoolean},
-    {(char *)"TableIterator_wasNull", (char *)"(JLcom/exasol/swig/TableIterator;)Z", (void *)&Java_com_exasol_swig_exascript_1javaJNI_TableIterator_1wasNull},
-    {(char *)"delete_TableIterator", (char *)"(J)V", (void *)&Java_com_exasol_swig_exascript_1javaJNI_delete_1TableIterator},
-
-    {(char *)"new_ResultHandler", (char *)"(JLcom/exasol/swig/TableIterator;)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_new_1ResultHandler},
-    {(char *)"ResultHandler_checkException", (char *)"(JLcom/exasol/swig/ResultHandler;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1checkException},
-    {(char *)"ResultHandler_reinitialize", (char *)"(JLcom/exasol/swig/ResultHandler;)V", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1reinitialize},
-    {(char *)"ResultHandler_next", (char *)"(JLcom/exasol/swig/ResultHandler;)Z", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1next},
-    {(char *)"ResultHandler_flush", (char *)"(JLcom/exasol/swig/ResultHandler;)V", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1flush},
-    {(char *)"ResultHandler_setDouble", (char *)"(JLcom/exasol/swig/ResultHandler;JD)V", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setDouble},
-    {(char *)"ResultHandler_setStringByteArray", (char *)"(JLcom/exasol/swig/ResultHandler;J[BJ)V", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setStringByteArray},
-    {(char *)"ResultHandler_setInt32", (char *)"(JLcom/exasol/swig/ResultHandler;JI)V", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setInt32},
-    {(char *)"ResultHandler_setInt64", (char *)"(JLcom/exasol/swig/ResultHandler;JJ)V", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setInt64},
-    {(char *)"ResultHandler_setNumeric", (char *)"(JLcom/exasol/swig/ResultHandler;JLjava/lang/String;)V", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setNumeric},
-    {(char *)"ResultHandler_setDate", (char *)"(JLcom/exasol/swig/ResultHandler;JLjava/lang/String;)V", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setDate},
-    {(char *)"ResultHandler_setTimestamp", (char *)"(JLcom/exasol/swig/ResultHandler;JLjava/lang/String;)V", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setTimestamp},
-    {(char *)"ResultHandler_setBoolean", (char *)"(JLcom/exasol/swig/ResultHandler;JZ)V", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setBoolean},
-    {(char *)"ResultHandler_setNull", (char *)"(JLcom/exasol/swig/ResultHandler;J)V", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ResultHandler_1setNull},
-    {(char *)"delete_ResultHandler", (char *)"(J)V", (void *)&Java_com_exasol_swig_exascript_1javaJNI_delete_1ResultHandler},
-
-
-    {(char *)"ConnectionInformationWrapper_copyKind",(char *)"(JLcom/exasol/swig/ConnectionInformationWrapper;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ConnectionInformationWrapper_1copyKind},
-    {(char *)"ConnectionInformationWrapper_copyAddress",(char *)"(JLcom/exasol/swig/ConnectionInformationWrapper;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ConnectionInformationWrapper_1copyAddress},
-    {(char *)"ConnectionInformationWrapper_copyUser",(char *)"(JLcom/exasol/swig/ConnectionInformationWrapper;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ConnectionInformationWrapper_1copyUser},
-    {(char *)"ConnectionInformationWrapper_copyPassword",(char *)"(JLcom/exasol/swig/ConnectionInformationWrapper;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ConnectionInformationWrapper_1copyPassword},
-
-
-    {(char *)"new_ImportSpecificationWrapper",(char*)"(J)J",(void*)&Java_com_exasol_swig_exascript_1javaJNI_new_1ImportSpecificationWrapper},
-    {(char *)"ImportSpecificationWrapper_isSubselect",(char *)"(JLcom/exasol/swig/ImportSpecificationWrapper;)Z", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1isSubselect},
-    {(char *)"ImportSpecificationWrapper_numSubselectColumns",(char *)"(JLcom/exasol/swig/ImportSpecificationWrapper;)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1numSubselectColumns},
-    {(char *)"ImportSpecificationWrapper_copySubselectColumnName",(char *)"(JLcom/exasol/swig/ImportSpecificationWrapper;J)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1copySubselectColumnName},
-    {(char *)"ImportSpecificationWrapper_copySubselectColumnType",(char *)"(JLcom/exasol/swig/ImportSpecificationWrapper;J)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1copySubselectColumnType},
-    {(char *)"ImportSpecificationWrapper_hasConnectionName",(char *)"(JLcom/exasol/swig/ImportSpecificationWrapper;)Z", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1hasConnectionName},
-    {(char *)"ImportSpecificationWrapper_hasConnectionInformation",(char *)"(JLcom/exasol/swig/ImportSpecificationWrapper;)Z", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1hasConnectionInformation},
-    {(char *)"ImportSpecificationWrapper_copyConnectionName",(char *)"(JLcom/exasol/swig/ImportSpecificationWrapper;)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1copyConnectionName},
-    {(char *)"ImportSpecificationWrapper_getConnectionInformation",(char *)"(JLcom/exasol/swig/ImportSpecificationWrapper;)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1getConnectionInformation},
-    {(char *)"ImportSpecificationWrapper_getNumberOfParameters",(char *)"(JLcom/exasol/swig/ImportSpecificationWrapper;)J", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1getNumberOfParameters},
-    {(char *)"ImportSpecificationWrapper_copyKey",(char *)"(JLcom/exasol/swig/ImportSpecificationWrapper;J)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1copyKey},
-    {(char *)"ImportSpecificationWrapper_copyValue",(char *)"(JLcom/exasol/swig/ImportSpecificationWrapper;J)Ljava/lang/String;", (void *)&Java_com_exasol_swig_exascript_1javaJNI_ImportSpecificationWrapper_1copyValue},
-
-
-    {(char *)"new_ExportSpecificationWrapper",(char *)"(J)J",(void *)&Java_com_exasol_swig_exascript_1javaJNI_new_1ExportSpecificationWrapper},
-    {(char *)"ExportSpecificationWrapper_hasConnectionName",(char *)"(JLcom/exasol/swig/ExportSpecificationWrapper;)Z",(void *)&Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1hasConnectionName},
-    {(char *)"ExportSpecificationWrapper_hasConnectionInformation",(char *)"(JLcom/exasol/swig/ExportSpecificationWrapper;)Z",(void *)&Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1hasConnectionInformation},
-    {(char *)"ExportSpecificationWrapper_copyConnectionName",(char *)"(JLcom/exasol/swig/ExportSpecificationWrapper;)Ljava/lang/String;",(void *)&Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1copyConnectionName},
-    {(char *)"ExportSpecificationWrapper_getConnectionInformation",(char *)"(JLcom/exasol/swig/ExportSpecificationWrapper;)J",(void *)&Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1getConnectionInformation},
-    {(char *)"ExportSpecificationWrapper_getNumberOfParameters",(char *)"(JLcom/exasol/swig/ExportSpecificationWrapper;)J",(void *)&Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1getNumberOfParameters},
-    {(char *)"ExportSpecificationWrapper_copyKey",(char *)"(JLcom/exasol/swig/ExportSpecificationWrapper;J)Ljava/lang/String;",(void *)&Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1copyKey},
-    {(char *)"ExportSpecificationWrapper_copyValue",(char *)"(JLcom/exasol/swig/ExportSpecificationWrapper;J)Ljava/lang/String;",(void *)&Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1copyValue},
-    {(char *)"ExportSpecificationWrapper_hasTruncate",(char *)"(JLcom/exasol/swig/ExportSpecificationWrapper;)Z",(void *)&Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1hasTruncate},
-    {(char *)"ExportSpecificationWrapper_hasReplace",(char *)"(JLcom/exasol/swig/ExportSpecificationWrapper;)Z",(void *)&Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1hasReplace},
-    {(char *)"ExportSpecificationWrapper_hasCreatedBy",(char *)"(JLcom/exasol/swig/ExportSpecificationWrapper;)Z",(void *)&Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1hasCreatedBy},
-    {(char *)"ExportSpecificationWrapper_copyCreatedBy",(char *)"(JLcom/exasol/swig/ExportSpecificationWrapper;)Ljava/lang/String;",(void *)&Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1copyCreatedBy},
-    {(char *)"ExportSpecificationWrapper_numSourceColumns",(char *)"(JLcom/exasol/swig/ExportSpecificationWrapper;)J",(void *)&Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1numSourceColumns},
-    {(char *)"ExportSpecificationWrapper_copySourceColumnName",(char *)"(JLcom/exasol/swig/ExportSpecificationWrapper;J)Ljava/lang/String;",(void *)&Java_com_exasol_swig_exascript_1javaJNI_ExportSpecificationWrapper_1copySourceColumnName},
-    {(char *)"delete_ExportSpecificationWrapper",(char *)"(J)V",(void *)&Java_com_exasol_swig_exascript_1javaJNI_delete_1ExportSpecificationWrapper},
-
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/exaudfclient/base/javacontainer/javacontainer.cc b/exaudfclient/base/javacontainer/javacontainer.cc
deleted file mode 100644
index d0e8556..0000000
--- a/exaudfclient/base/javacontainer/javacontainer.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "javacontainer/javacontainer.h"
-#include "javacontainer/javacontainer_impl.h"
-#include "javacontainer/script_options/extractor.h"
-
-using namespace SWIGVMContainers;
-using namespace std;
-
-JavaVMach::JavaVMach(bool checkOnly,std::unique_ptr<JavaScriptOptions::Extractor> extractor) {
-    try {
-        m_impl = new JavaVMImpl(checkOnly, false, std::move(extractor));
-    } catch (std::exception& err) {
-        lock_guard<mutex> lock(exception_msg_mtx);
-        exception_msg = "F-UDF-CL-SL-JAVA-1000: "+std::string(err.what());
-    } catch (...) {
-        lock_guard<mutex> lock(exception_msg_mtx);
-        exception_msg = "F-UDF-CL-SL-JAVA-1001: JVM crashed for unknown reason";
-    }
-}
-
-
-bool JavaVMach::run() {
-    try {
-        return m_impl->run();
-    }  catch (std::exception& err) {
-        lock_guard<mutex> lock(exception_msg_mtx);
-        exception_msg = "F-UDF-CL-SL-JAVA-1002: "+std::string(err.what());
-    } catch (...) {
-        lock_guard<mutex> lock(exception_msg_mtx);
-        exception_msg = "F-UDF-CL-SL-JAVA-1003: JVM crashed for unknown reason";
-    }
-    return false;
-}
-
-void JavaVMach::shutdown() {
-    try {
-        m_impl->shutdown();
-    }  catch (std::exception& err) {
-        lock_guard<mutex> lock(exception_msg_mtx);
-        exception_msg = "F-UDF-CL-SL-JAVA-1004: "+std::string(err.what());
-    } catch (...) {
-        lock_guard<mutex> lock(exception_msg_mtx);
-        exception_msg = "F-UDF-CL-SL-JAVA-1005: JVM crashed for unknown reason";
-    }
-}
-
-const char* JavaVMach::singleCall(single_call_function_id_e fn, const ExecutionGraph::ScriptDTO& args) {
-    try {
-        return m_impl->singleCall(fn, args, calledUndefinedSingleCall);
-    } catch (std::exception& err) {
-        lock_guard<mutex> lock(exception_msg_mtx);
-        exception_msg = "F-UDF-CL-SL-JAVA-1006: "+std::string(err.what());
-    } catch (...) {
-        lock_guard<mutex> lock(exception_msg_mtx);
-        exception_msg = "F-UDF-CL-SL-JAVA-1007: JVM crashed for unknown reason";
-    }
-    return strdup("<this is an error>");
-}
diff --git a/exaudfclient/base/javacontainer/javacontainer.h b/exaudfclient/base/javacontainer/javacontainer.h
deleted file mode 100644
index fca3d33..0000000
--- a/exaudfclient/base/javacontainer/javacontainer.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef JAVACONTAINER_H
-#define JAVACONTAINER_H
-
-
-#include "exaudflib/vm/swig_vm.h"
-#include <string.h>
-#include <memory>
-
-#ifdef ENABLE_JAVA_VM
-
-namespace SWIGVMContainers {
-
-class JavaVMImpl;
-
-namespace JavaScriptOptions {
-
-struct Extractor;
-
-}
-
-class JavaVMach: public SWIGVM {
-    public:
-        /*
-         * scriptOptionsParser: JavaVMach takes ownership of ScriptOptionsParser pointer.
-         */
-        JavaVMach(bool checkOnly, std::unique_ptr<JavaScriptOptions::Extractor> extractor);
-        virtual ~JavaVMach() {}
-        virtual void shutdown();
-        virtual bool run();
-        virtual const char* singleCall(single_call_function_id_e fn, const ExecutionGraph::ScriptDTO& args);
-    private:
-        JavaVMImpl *m_impl;
-};
-
-} //namespace SWIGVMContainers
-
-
-#endif //ENABLE_JAVA_VM
-
-
-#endif //JAVACONTAINER_H
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/javacontainer_builder.cc b/exaudfclient/base/javacontainer/javacontainer_builder.cc
deleted file mode 100644
index f44b9ef..0000000
--- a/exaudfclient/base/javacontainer/javacontainer_builder.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "javacontainer/javacontainer_builder.h"
-#include "javacontainer/script_options/extractor_impl.h"
-#include "swig_factory/swig_factory_impl.h"
-
-#ifdef ENABLE_JAVA_VM
-
-namespace SWIGVMContainers {
-
-JavaContainerBuilder::JavaContainerBuilder()
-: m_useCtpgParser(false) {}
-
-JavaContainerBuilder& JavaContainerBuilder::useCtpgParser() {
-    m_useCtpgParser = true;
-    return *this;
-}
-
-JavaVMach* JavaContainerBuilder::build() {
-    std::unique_ptr<JavaScriptOptions::Extractor> extractor;
-    if (m_useCtpgParser) {
-        extractor = std::make_unique<JavaScriptOptions::tExtractorV2>(std::make_unique<SwigFactoryImpl>());
-    } else {
-        extractor = std::make_unique<JavaScriptOptions::tExtractorLegacy>(std::make_unique<SwigFactoryImpl>());
-    }
-    return new JavaVMach(false, std::move(extractor));
-}
-
-
-} //namespace SWIGVMContainers
-
-
-#endif //ENABLE_JAVA_VM
diff --git a/exaudfclient/base/javacontainer/javacontainer_builder.h b/exaudfclient/base/javacontainer/javacontainer_builder.h
deleted file mode 100644
index 9a7113d..0000000
--- a/exaudfclient/base/javacontainer/javacontainer_builder.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef JAVACONTAINER_BUILDER_H
-#define JAVACONTAINER_BUILDER_H
-
-#include <memory>
-#include "javacontainer/javacontainer.h"
-
-#ifdef ENABLE_JAVA_VM
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-struct ScriptOptionsParser;
-
-}
-
-class JavaContainerBuilder {
-    public:
-        JavaContainerBuilder();
-
-        JavaContainerBuilder& useCtpgParser();
-
-        JavaVMach* build();
-
-    private:
-        bool m_useCtpgParser;
-};
-
-} //namespace SWIGVMContainers
-
-
-#endif //ENABLE_JAVA_VM
-
-
-#endif //JAVACONTAINER_BUILDER_H
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/javacontainer_impl.cc b/exaudfclient/base/javacontainer/javacontainer_impl.cc
deleted file mode 100644
index 5820bb2..0000000
--- a/exaudfclient/base/javacontainer/javacontainer_impl.cc
+++ /dev/null
@@ -1,454 +0,0 @@
-#include <iostream>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <set>
-#include <jni.h>
-#include <unistd.h>
-#include <sstream>
-
-#include "exascript_java_jni_decl.h"
-
-#include "utils/debug_message.h"
-#include "javacontainer/javacontainer.h"
-#include "javacontainer/javacontainer_impl.h"
-#include "javacontainer/script_options/extractor.h"
-
-
-using namespace SWIGVMContainers;
-using namespace std;
-
-JavaVMImpl::JavaVMImpl(bool checkOnly, bool noJNI,
-                        std::unique_ptr<JavaScriptOptions::Extractor> extractor)
-: m_checkOnly(checkOnly)
-, m_exaJavaPath("")
-, m_localClasspath("/tmp") // **IMPORTANT**: /tmp needs to be in the classpath, otherwise ExaCompiler crashe with com.exasol.ExaCompilationException: /DATE_STRING.java:3: error: error while writing DATE_STRING: could not create parent directories
-, m_scriptCode(SWIGVM_params->script_code)
-, m_jvm(NULL)
-, m_env(NULL)
-, m_needsCompilation(true)
-{
-
-    stringstream ss;
-    //Path "external/exaudfclient_base+/" comes from external module "exaudfclient_base"
-    m_exaJavaPath = "/exaudf/external/exaudfclient_base+/javacontainer"; // TODO hardcoded path
-
-    parseScriptOptions(std::move(extractor));
-
-    m_needsCompilation = checkNeedsCompilation();
-    if (m_needsCompilation) {
-        DBG_FUNC_CALL(cerr,addPackageToScript());
-        DBG_FUNC_CALL(cerr,addLocalClasspath());
-    }
-    DBG_FUNC_CALL(cerr,setJvmOptions());
-    if(false == noJNI) {
-        DBG_FUNC_CALL(cerr,createJvm());
-        DBG_FUNC_CALL(cerr,registerFunctions());
-        if (m_needsCompilation) {
-            DBG_FUNC_CALL(cerr,compileScript());
-        }
-    }
-}
-
-void JavaVMImpl::parseScriptOptions(std::unique_ptr<JavaScriptOptions::Extractor> extractor) {
-
-    DBG_FUNC_CALL(cerr,extractor->extract(m_scriptCode));
-
-    DBG_FUNC_CALL(cerr,setClasspath());
-
-    m_jvmOptions = std::move(extractor->moveJvmOptions());
-
-    extractor->iterateJarPaths([&](const std::string& s) { addJarToClasspath(s);});
-}
-
-void JavaVMImpl::shutdown() {
-    if (m_checkOnly)
-        throw JavaVMach::exception("F-UDF.CL.SL.JAVA-1159: Java VM in check only mode");
-    jclass cls = m_env->FindClass("com/exasol/ExaWrapper");
-    string calledUndefinedSingleCall;
-    check("F-UDF.CL.SL.JAVA-1160",calledUndefinedSingleCall);
-    if (!cls)
-        throw JavaVMach::exception("F-UDF.CL.SL.JAVA-1161: FindClass for ExaWrapper failed");
-    jmethodID mid = m_env->GetStaticMethodID(cls, "cleanup", "()V");
-    check("F-UDF.CL.SL.JAVA-1162",calledUndefinedSingleCall);
-    if (!mid)
-        throw JavaVMach::exception("F-UDF.CL.SL.JAVA-1163: GetStaticMethodID for run failed");
-    m_env->CallStaticVoidMethod(cls, mid);
-    check("F-UDF.CL.SL.JAVA-1164",calledUndefinedSingleCall);
-    try {
-        m_jvm->DestroyJavaVM();
-    } catch(...) { 
-    
-    }
-}
-
-bool JavaVMImpl::run() {
-    if (m_checkOnly)
-        throw JavaVMach::exception("F-UDF-CL-SL-JAVA-1008: Java VM in check only mode");
-    jclass cls = m_env->FindClass("com/exasol/ExaWrapper");
-    string calledUndefinedSingleCall;
-    check("F-UDF-CL-SL-JAVA-1009",calledUndefinedSingleCall);
-    if (!cls)
-        throw JavaVMach::exception("F-UDF-CL-SL-JAVA-1010: FindClass for ExaWrapper failed");
-    jmethodID mid = m_env->GetStaticMethodID(cls, "run", "()V");
-    check("F-UDF-CL-SL-JAVA-1011",calledUndefinedSingleCall);
-    if (!mid)
-        throw JavaVMach::exception("F-UDF-CL-SL-JAVA-1012: GetStaticMethodID for run failed");
-    m_env->CallStaticVoidMethod(cls, mid);
-    check("F-UDF-CL-SL-JAVA-1013",calledUndefinedSingleCall);
-    return true;
-}
-
-static string singleCallResult;
-
-const char* JavaVMImpl::singleCall(single_call_function_id_e fn, const ExecutionGraph::ScriptDTO& args, string& calledUndefinedSingleCall) {
-
-    if (m_checkOnly)
-        throw JavaVMach::exception("F-UDF-CL-SL-JAVA-1014: Java VM in check only mode");
-
-    const char* func = NULL;
-    switch (fn) {
-        case SC_FN_NIL: break;
-        case SC_FN_DEFAULT_OUTPUT_COLUMNS: func = "getDefaultOutputColumns"; break;
-        case SC_FN_VIRTUAL_SCHEMA_ADAPTER_CALL: func = "adapterCall"; break;
-        case SC_FN_GENERATE_SQL_FOR_IMPORT_SPEC: func = "generateSqlForImportSpec"; break;
-        case SC_FN_GENERATE_SQL_FOR_EXPORT_SPEC: func = "generateSqlForExportSpec"; break;
-    }
-    if (func == NULL) {
-        throw JavaVMach::exception("F-UDF-CL-SL-JAVA-1015: Unknown single call "+std::to_string(fn));
-    }
-    jclass cls = m_env->FindClass("com/exasol/ExaWrapper");
-    check("F-UDF-CL-SL-JAVA-1016",calledUndefinedSingleCall);
-    if (!cls)
-        throw JavaVMach::exception("F-UDF-CL-SL-JAVA-1017: FindClass for ExaWrapper failed");
-    jmethodID mid = m_env->GetStaticMethodID(cls, "runSingleCall", "(Ljava/lang/String;Ljava/lang/Object;)[B");
-    check("F-UDF-CL-SL-JAVA-1018",calledUndefinedSingleCall);
-    if (!mid)
-        throw JavaVMach::exception("F-UDF-CL-SL-JAVA-1019: GetStaticMethodID for run failed");
-    jstring fn_js = m_env->NewStringUTF(func);
-    check("F-UDF-CL-SL-JAVA-1020",calledUndefinedSingleCall);
-
-
-    // Prepare arg
-    // TODO VS This will be refactored completely
-    // We intentionally define these variables outside so that they are not destroyed too early
-    jobject args_js = NULL;
-    ExecutionGraph::ImportSpecification* imp_spec;
-    ExecutionGraph::ImportSpecificationWrapper imp_spec_wrapper(NULL);
-    ExecutionGraph::ExportSpecification* exp_spec;
-    ExecutionGraph::ExportSpecificationWrapper exp_spec_wrapper(NULL);
-    if (fn == SC_FN_GENERATE_SQL_FOR_IMPORT_SPEC) {
-        imp_spec = const_cast<ExecutionGraph::ImportSpecification*>(dynamic_cast<const ExecutionGraph::ImportSpecification*>(&args));
-        imp_spec_wrapper = ExecutionGraph::ImportSpecificationWrapper(imp_spec);
-        if (imp_spec)
-        {         
-            jclass import_spec_wrapper_cls = m_env->FindClass("com/exasol/swig/ImportSpecificationWrapper");
-            check("F-UDF-CL-SL-JAVA-1021",calledUndefinedSingleCall);
-            jmethodID import_spec_wrapper_constructor = m_env->GetMethodID(import_spec_wrapper_cls, "<init>", "(JZ)V");
-            check("F-UDF-CL-SL-JAVA-1022",calledUndefinedSingleCall);
-            args_js = m_env->NewObject(import_spec_wrapper_cls, import_spec_wrapper_constructor, &imp_spec_wrapper, false);
-        }
-    } else if (fn == SC_FN_GENERATE_SQL_FOR_EXPORT_SPEC) {
-        exp_spec = const_cast<ExecutionGraph::ExportSpecification*>(dynamic_cast<const ExecutionGraph::ExportSpecification*>(&args));
-        exp_spec_wrapper = ExecutionGraph::ExportSpecificationWrapper(exp_spec);
-        if (exp_spec)
-        {
-            jclass export_spec_wrapper_cls = m_env->FindClass("com/exasol/swig/ExportSpecificationWrapper");
-            check("F-UDF-CL-SL-JAVA-1023",calledUndefinedSingleCall);
-            jmethodID export_spec_wrapper_constructor = m_env->GetMethodID(export_spec_wrapper_cls, "<init>", "(JZ)V");
-            check("F-UDF-CL-SL-JAVA-1024",calledUndefinedSingleCall);
-            args_js = m_env->NewObject(export_spec_wrapper_cls, export_spec_wrapper_constructor, &exp_spec_wrapper, false);
-        }
-    } else if (fn == SC_FN_VIRTUAL_SCHEMA_ADAPTER_CALL) {
-        const ExecutionGraph::StringDTO* argDto = dynamic_cast<const ExecutionGraph::StringDTO*>(&args);
-        string string_arg = argDto->getArg();
-        args_js = m_env->NewStringUTF(string_arg.c_str());
-    }
-    
-    check("F-UDF-CL-SL-JAVA-1025",calledUndefinedSingleCall);
-    jbyteArray resJ = (jbyteArray)m_env->CallStaticObjectMethod(cls, mid, fn_js, args_js);
-    if (check("F-UDF-CL-SL-JAVA-1026",calledUndefinedSingleCall) == 0) return strdup("<error during singleCall>");
-    jsize resLen = m_env->GetArrayLength(resJ);
-    check("F-UDF-CL-SL-JAVA-1027",calledUndefinedSingleCall);
-    char* buffer = new char[resLen + 1];
-    m_env->GetByteArrayRegion(resJ, 0, resLen, reinterpret_cast<jbyte*>(buffer));
-    buffer[resLen] = '\0';
-    singleCallResult = string(buffer);
-    delete buffer;
-    m_env->DeleteLocalRef(args_js);
-    m_env->DeleteLocalRef(resJ);
-
-
-    return singleCallResult.c_str();
-}
-
-void JavaVMImpl::addPackageToScript() {
-    // Each script is generated in the com.exasol package, not in the default
-    // package. Scripts classes may not be in the default package because
-    // com.exasol.ExaWrapper requires to call run() on them (accessing default
-    // package from a non-default package is not allowed). Furthermore, only if
-    // the script is in the same package as ExaWrapper the script can be
-    // defined as package-private.
-    m_scriptCode = "package com.exasol;\r\n" + m_scriptCode;
-}
-
-void JavaVMImpl::createJvm() {
-    unsigned int numJvmOptions = m_jvmOptions.size();
-    JavaVMOption *options = new JavaVMOption[numJvmOptions];
-    for (size_t i = 0; i < numJvmOptions; ++i) {
-        options[i].optionString = strdup((char*)(m_jvmOptions[i].c_str()));
-        DBGVAR(cerr,options[i].optionString);
-        options[i].extraInfo = NULL;
-    }
-
-    JavaVMInitArgs vm_args;
-    vm_args.version = JNI_VERSION_1_2;
-    vm_args.nOptions = numJvmOptions;
-    vm_args.options = options;
-    vm_args.ignoreUnrecognized = JNI_FALSE;
-    //vm_args.ignoreUnrecognized = JNI_TRUE;
-    DBGVAR(cerr,m_env);
-    
-    DBG_FUNC_CALL(cerr,int rc = JNI_CreateJavaVM(&m_jvm, (void**)&m_env, &vm_args));
-    if (rc != JNI_OK) {
-        stringstream ss;
-        ss << "F-UDF-CL-SL-JAVA-1028: Cannot start the JVM: ";
-        switch (rc) {
-            case JNI_ERR: ss << "unknown error"; break;
-            case JNI_EDETACHED: ss << "thread is detached from VM"; break;
-            case JNI_EVERSION: ss << "version error"; break;
-            case JNI_ENOMEM: ss << "out of memory"; break;
-            case JNI_EEXIST: ss << "VM already exists"; break;
-            case JNI_EINVAL: ss << "invalid arguments"; break;
-            default: ss << "unknown"; break;
-        }
-        ss << " (" << rc << ")";
-        delete [] options;
-        throw JavaVMach::exception(ss.str());
-    }
-    delete [] options;
-}
-
-void JavaVMImpl::compileScript() {
-    string calledUndefinedSingleCall;
-    jstring classnameStr = m_env->NewStringUTF(SWIGVM_params->script_name);
-    check("F-UDF-CL-SL-JAVA-1029",calledUndefinedSingleCall);
-    jstring codeStr = m_env->NewStringUTF(m_scriptCode.c_str());
-    check("F-UDF-CL-SL-JAVA-1030",calledUndefinedSingleCall);
-    jstring classpathStr = m_env->NewStringUTF(m_localClasspath.c_str());
-    check("F-UDF-CL-SL-JAVA-1031",calledUndefinedSingleCall);
-    if (!classnameStr || !codeStr || !classpathStr)
-        throw JavaVMach::exception("F-UDF-CL-SL-JAVA-1032: NewStringUTF for compile failed");
-    jclass cls = m_env->FindClass("com/exasol/ExaCompiler");
-    check("F-UDF-CL-SL-JAVA-1033",calledUndefinedSingleCall);
-    if (!cls)
-        throw JavaVMach::exception("F-UDF-CL-SL-JAVA-1034: FindClass for ExaCompiler failed");
-    jmethodID mid = m_env->GetStaticMethodID(cls, "compile", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
-    check("F-UDF-CL-SL-JAVA-1035",calledUndefinedSingleCall);
-    if (!mid)
-        throw JavaVMach::exception("F-UDF-CL-SL-JAVA-1036: GetStaticMethodID for compile failed");
-    m_env->CallStaticVoidMethod(cls, mid, classnameStr, codeStr, classpathStr);
-    check("F-UDF-CL-SL-JAVA-1037",calledUndefinedSingleCall);
-}
-
-
-bool JavaVMImpl::check(const string& errorCode, string& calledUndefinedSingleCall) {
-    jthrowable ex = m_env->ExceptionOccurred();
-    if (ex) {
-        m_env->ExceptionClear();
-
-        jclass undefinedSingleCallExceptionClass = m_env->FindClass("com/exasol/ExaUndefinedSingleCallException");
-        if (!undefinedSingleCallExceptionClass) {
-            throw JavaVMach::exception(errorCode+": F-UDF-CL-SL-JAVA-1042: FindClass for com.exasol.ExaUndefinedSingleCallException failed");
-        }
-        if (m_env->IsInstanceOf(ex, undefinedSingleCallExceptionClass)) {
-            jmethodID undefinedRemoteFn = m_env->GetMethodID(undefinedSingleCallExceptionClass, "getUndefinedRemoteFn", "()Ljava/lang/String;");
-            check("F-UDF-CL-SL-JAVA-1043",calledUndefinedSingleCall);
-            if (!undefinedRemoteFn)
-                throw JavaVMach::exception(errorCode+": F-UDF-CL-SL-JAVA-1044: com.exasol.ExaUndefinedSingleCallException.getUndefinedRemoteFn() could not be found");
-            jobject undefinedRemoteFnString = m_env->CallObjectMethod(ex,undefinedRemoteFn);
-            if (undefinedRemoteFnString) {
-                jstring fn = static_cast<jstring>(undefinedRemoteFnString);
-                const char *fn_str = m_env->GetStringUTFChars(fn,0);
-                std::string fn_string = fn_str;
-                m_env->ReleaseStringUTFChars(fn,fn_str); 
-                calledUndefinedSingleCall = fn_string; 
-                return 0;
-                //swig_undefined_single_call_exception ex(fn_string);
-                //throwException(ex);
-            } else {
-               throw JavaVMach::exception(errorCode+": F-UDF-CL-SL-JAVA-1045: Internal error: getUndefinedRemoteFn() returned no result");
-            } 
-        }
-
-        string exceptionMessage = "";
-        jclass exClass = m_env->GetObjectClass(ex);
-        if (!exClass)
-            throw JavaVMach::exception(errorCode+": F-UDF-CL-SL-JAVA-1046: FindClass for Throwable failed");
-        // Throwable.toString()
-        jmethodID toString = m_env->GetMethodID(exClass, "toString", "()Ljava/lang/String;");
-        check("F-UDF-CL-SL-JAVA-1047",calledUndefinedSingleCall);
-        if (!toString)
-            throw JavaVMach::exception(errorCode+": F-UDF-CL-SL-JAVA-1048: Throwable.toString() could not be found");
-        jobject object = m_env->CallObjectMethod(ex, toString);
-        if (object) {
-            jstring message = static_cast<jstring>(object);
-            char const *utfMessage = m_env->GetStringUTFChars(message, 0);
-            exceptionMessage.append("\n");
-            exceptionMessage.append(utfMessage);
-            m_env->ReleaseStringUTFChars(message, utfMessage);
-        }
-        else {
-            exceptionMessage.append(errorCode+": F-UDF-CL-SL-JAVA-1049: Throwable.toString(): result is null");
-        }
-
-//        // Build Stacktrace
-//
-//        // Throwable.getStackTrace()
-//        jmethodID getStackTrace = m_env->GetMethodID(exClass, "getStackTrace", "()[Ljava/lang/StackTraceElement;");
-//        check("F-UDF-CL-SL-JAVA-1050",calledUndefinedSingleCall);
-//        if (!getStackTrace)
-//            throwException(errorCode+": F-UDF-CL-SL-JAVA-1051: Throwable.getStackTrace() could not be found");
-//        jobjectArray frames = (jobjectArray)m_env->CallObjectMethod(ex, getStackTrace);
-//        if (frames) {
-//            jclass frameClass = m_env->FindClass("java/lang/StackTraceElement");
-//            check("F-UDF-CL-SL-JAVA-1052",calledUndefinedSingleCall);
-//            if (!frameClass)
-//                throwException(errorCode+": F-UDF-CL-SL-JAVA-1053: FindClass for StackTraceElement failed");
-//            jmethodID frameToString = m_env->GetMethodID(frameClass, "toString", "()Ljava/lang/String;");
-//            check("F-UDF-CL-SL-JAVA-1054",calledUndefinedSingleCall);
-//            if (!frameToString)
-//                throwException(errorCode+": F-UDF-CL-SL-JAVA-1055: StackTraceElement.toString() could not be found");
-//            jsize framesLength = m_env->GetArrayLength(frames);
-//            for (int i = 0; i < framesLength; i++) {
-//                jobject frame = m_env->GetObjectArrayElement(frames, i);
-//                check("F-UDF-CL-SL-JAVA-1056",calledUndefinedSingleCall);
-//                jobject frameMsgObj = m_env->CallObjectMethod(frame, frameToString);
-//                if (frameMsgObj) {
-//                    jstring message = static_cast<jstring>(frameMsgObj);
-//                    const char *utfMessage = m_env->GetStringUTFChars(message, 0);
-//                    string line = utfMessage;
-//                    // If stack trace lines are wrapper or reflection entries, stop
-//                    if ((line.find("ExaWrapper.") == 0) || (line.find("ExaCompiler.") == 0) || (line.find("sun.reflect.") == 0)) {
-//                        if (i != 0)
-//                            exceptionMessage.append("\n");
-//                        m_env->ReleaseStringUTFChars(message, utfMessage);
-//                        break;
-//                    }
-//                    else {
-//                        if (i == 0)
-//                            exceptionMessage.append("\nStack trace:");
-//                        exceptionMessage.append("\n");
-//                        exceptionMessage.append(utfMessage);
-//                        m_env->ReleaseStringUTFChars(message, utfMessage);
-//                    }
-//                }
-//            }
-//        }
-        throw JavaVMach::exception(errorCode+": "+exceptionMessage);
-    }
-    return 1;
-}
-
-void JavaVMImpl::registerFunctions() {
-    string calledUndefinedSingleCall;
-    jclass cls = m_env->FindClass("com/exasol/swig/exascript_javaJNI");
-    check("F-UDF-CL-SL-JAVA-1057",calledUndefinedSingleCall);
-    if (!cls)
-        throw JavaVMach::exception("F-UDF-CL-SL-JAVA-1058: FindClass for exascript_javaJNI failed");
-    int rc = m_env->RegisterNatives(cls, methods, sizeof(methods) / sizeof(methods[0]));
-    check("F-UDF-CL-SL-JAVA-1059",calledUndefinedSingleCall);
-    if (rc)
-        throw JavaVMach::exception("F-UDF-CL-SL-JAVA-1060: RegisterNatives failed");
-}
-
-void JavaVMImpl::setClasspath() {
-    m_exaJarPath = m_exaJavaPath + "/exaudf_deploy.jar";
-    m_classpath = m_exaJarPath;
-}
-
-void JavaVMImpl::addLocalClasspath() {
-    m_classpath = m_localClasspath + ":" + m_classpath;
-}
-
-bool JavaVMImpl::checkNeedsCompilation() {
-    std::string trimmedScriptCode = m_scriptCode;
-    trimmedScriptCode.erase(0, trimmedScriptCode.find_first_not_of("\t\n\r ")); // left trim
-    trimmedScriptCode.erase(trimmedScriptCode.find_last_not_of("\t\n\r ") + 1); // right trim
-    return false == trimmedScriptCode.empty();
-}
-
-void JavaVMImpl::addJarToClasspath(const string& path) {
-    string jarPath = path; // m_exaJavaPath + "/jars/" + path;
-
-    struct stat st;
-    int rc = stat(jarPath.c_str(), &st);
-    if (rc && errno == ENOENT) {
-        // Not found in HOME, try path directly
-        jarPath = path;
-        rc = stat(jarPath.c_str(), &st);
-        if (rc) {
-            stringstream errorMsg;
-            errorMsg << "F-UDF-CL-SL-JAVA-1061: Java VM cannot find '" << jarPath.c_str() << "': " << strerror(errno);
-            throw JavaVMach::exception(errorMsg.str());
-        }
-    }
-    else if (rc) {
-        stringstream errorMsg;
-        errorMsg << "F-UDF-CL-SL-JAVA-1062: Java VM cannot find '" << jarPath.c_str() << "': " << strerror(errno);
-        throw JavaVMach::exception(errorMsg.str());
-    }
-
-    if (!S_ISREG(st.st_mode)) {
-        stringstream errorMsg;
-        errorMsg << "F-UDF-CL-SL-JAVA-1063: '" << jarPath.c_str() << "' is not a regular file";
-        throw JavaVMach::exception(errorMsg.str());
-    }
-
-    // Add file to classpath
-    m_classpath += ":" + jarPath;
-}
-
-
-void JavaVMImpl::setJvmOptions() {
-    bool minHeap = false;
-    bool maxHeap = false;
-    bool maxStack = false;
-    for (vector<string>::iterator it = m_jvmOptions.begin(); it != m_jvmOptions.end(); ++it) {
-        if ((*it).find("-Xms") != string::npos) {
-            minHeap = true;
-        }
-        else if ((*it).find("-Xmx") != string::npos) {
-            maxHeap = true;
-        }
-        else if ((*it).find("-Xss") != string::npos) {
-            maxStack = true;
-        }
-    }
-
-    // Initial heap size
-    unsigned long minHeapSize = 128;
-    unsigned long maxHeapSize = 1024;
-    if (!minHeap) {
-        stringstream ss;
-        ss << "-Xms" << minHeapSize << "m";
-        m_jvmOptions.push_back(ss.str());
-    }
-    // Max heap size
-    if (!maxHeap) {
-        unsigned long maxHeapSizeMb = static_cast<long>(0.625 * (SWIGVM_params->maximal_memory_limit / (1024 * 1024)));
-        maxHeapSizeMb = (maxHeapSizeMb < minHeapSize) ? minHeapSize : maxHeapSizeMb;
-        maxHeapSizeMb = (maxHeapSizeMb > maxHeapSize) ? maxHeapSize : maxHeapSizeMb;
-        stringstream ss;
-        ss << "-Xmx" << maxHeapSizeMb << "m";
-        m_jvmOptions.push_back(ss.str());
-    }
-    // Max thread stack size
-    if (!maxStack)
-        m_jvmOptions.push_back("-Xss512k");
-    // Error file path
-    m_jvmOptions.push_back("-XX:ErrorFile=" + m_localClasspath + "/hs_err_pid%p.log");
-    // Classpath
-    m_jvmOptions.push_back("-Djava.class.path=" + m_classpath);
-    // Serial garbage collection
-    m_jvmOptions.push_back("-XX:+UseSerialGC"); // TODO allow different Garbage Collectors, multiple options are not allowed, so we need to check if options was specified by the user or otherwise use -XX:+UseSerialGC as default
-}
diff --git a/exaudfclient/base/javacontainer/javacontainer_impl.h b/exaudfclient/base/javacontainer/javacontainer_impl.h
deleted file mode 100644
index 0423b21..0000000
--- a/exaudfclient/base/javacontainer/javacontainer_impl.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef JAVACONTAINER_IMPL_H
-#define JAVACONTAINER_IMPL_H
-
-#include <string>
-#include <vector>
-#include <set>
-#include <memory>
-
-#include "exaudflib/vm/swig_vm.h"
-#include <jni.h>
-
-#ifdef ENABLE_JAVA_VM
-
-class JavaVMTest;
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-    struct Extractor;
-}
-
-class JavaVMImpl {
-    public:
-        friend class ::JavaVMTest;
-        /*
-         * scriptOptionsParser: JavaVMImpl takes ownership of ScriptOptionsParser pointer.
-         */
-        JavaVMImpl(bool checkOnly, bool noJNI, std::unique_ptr<JavaScriptOptions::Extractor> extractor);
-        ~JavaVMImpl() {}
-        void shutdown();
-        bool run();
-        const char* singleCall(single_call_function_id_e fn, const ExecutionGraph::ScriptDTO& args,
-                                std::string& calledUndefinedSingleCall);
-    private:
-        void createJvm();
-        void addPackageToScript();
-        void compileScript();
-        bool check(const std::string& errorCode, std::string& calledUndefinedSingleCall); // returns 0 if the check failed
-        void registerFunctions();
-        void addLocalClasspath();
-        bool checkNeedsCompilation();
-        void setClasspath();
-        void setJvmOptions();
-        void addJarToClasspath(const std::string& path);
-        void parseScriptOptions(std::unique_ptr<JavaScriptOptions::Extractor> extractor);
-        bool m_checkOnly;
-        std::string m_exaJavaPath;
-        std::string m_localClasspath;
-        std::string m_scriptCode;
-        std::string m_exaJarPath;
-        std::string m_classpath;
-        std::vector<std::string> m_jvmOptions;
-        JavaVM *m_jvm;
-        JNIEnv *m_env;
-        bool m_needsCompilation;
-};
-
-} //namespace SWIGVMContainers
-
-
-#endif //ENABLE_JAVA_VM
-
-
-#endif //JAVACONTAINER_IMPL_H
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/script_options/BUILD b/exaudfclient/base/javacontainer/script_options/BUILD
deleted file mode 100644
index 3bf350f..0000000
--- a/exaudfclient/base/javacontainer/script_options/BUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@rules_cc//cc:defs.bzl", "cc_library")
-
-cc_library(
-    name = "java_script_option_lines",
-    hdrs = [":extractor.h", ":extractor_impl.h", ":parser_legacy.h", ":parser_ctpg.h",
-            ":converter_v2.h", ":converter_legacy.h"],
-    srcs = [":parser.h", ":converter.h", ":converter.cc", ":parser_legacy.cc", ":extractor_impl.h",
-            ":extractor_impl.cc", ":converter_legacy.cc", ":converter_legacy.h",
-            ":converter_v2.cc", ":converter_v2.h",
-            ":keywords.h", ":keywords.cc", ":distinct_script_set.h", ":distinct_script_set.cc", ":parser_ctpg.cc",
-            ":parser_ctpg_script_importer.cc", ":parser_ctpg_script_importer.h",
-            ":parser_ctpg_jvm_options_parser.cc", ":parser_ctpg_jvm_options_parser.h", ":string_ops.h", ":string_ops.cc"],
-    deps = ["//script_options_parser/legacy:script_option_lines_parser_legacy",
-            "//script_options_parser/ctpg:script_option_lines_parser_ctpg", "//utils:utils",
-            "//exaudflib:header", "//exaudflib:exaudflib-deps", "//swig_factory:swig_factory_if",
-            "//script_options_parser:exception"],
-)
diff --git a/exaudfclient/base/javacontainer/script_options/converter.cc b/exaudfclient/base/javacontainer/script_options/converter.cc
deleted file mode 100644
index d2f7103..0000000
--- a/exaudfclient/base/javacontainer/script_options/converter.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "javacontainer/script_options/converter.h"
-
-#include <iostream>
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-Converter::Converter()
-: m_jvmOptions()
-, m_whitespace(" \t\f\v") {}
-
-void Converter::convertScriptClassName(const std::string & value) {
-
-    if (value.empty()) {
-        return;
-    }
-    m_jvmOptions.push_back("-Dexasol.scriptclass=" + value);
-}
-
-
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
diff --git a/exaudfclient/base/javacontainer/script_options/converter.h b/exaudfclient/base/javacontainer/script_options/converter.h
deleted file mode 100644
index ec7516e..0000000
--- a/exaudfclient/base/javacontainer/script_options/converter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef SCRIPTOPTIONLINEPARSERCONVERTER_H
-#define SCRIPTOPTIONLINEPARSERCONVERTER_H 1
-
-#include <string>
-#include <vector>
-#include <functional>
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-/**
- * This class retrieves the raw Java script option values (scriptclass, jvmoption, jar)
- * and converts them to the proper format expected by the JvmContainerImpl class.
- * Besides the converter functions it provides methods to access the converted values.
- */
-class Converter {
-
-    public:
-        typedef std::function<void(const std::string &option)> tJarIteratorCallback;
-
-        Converter();
-    
-        void convertScriptClassName(const std::string & value);
-
-        virtual void convertJvmOption(const std::string & value) = 0;
-
-        std::vector<std::string>&& moveJvmOptions() {
-            return std::move(m_jvmOptions);
-        }
-
-        virtual void convertExternalJar(const std::string & value) = 0;
-
-        virtual void iterateJarPaths(tJarIteratorCallback callback) const = 0;
-
-    protected:
-
-        std::vector<std::string> m_jvmOptions;
-
-        const std::string m_whitespace;
-};
-
-
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
-
-#endif //SCRIPTOPTIONLINEPARSERCONVERTER_H
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/script_options/converter_legacy.cc b/exaudfclient/base/javacontainer/script_options/converter_legacy.cc
deleted file mode 100644
index ddf4276..0000000
--- a/exaudfclient/base/javacontainer/script_options/converter_legacy.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "javacontainer/script_options/converter_legacy.h"
-#include "javacontainer/script_options/string_ops.h"
-#include <iostream>
-#include <sstream>
-#include <algorithm>
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-ConverterLegacy::ConverterLegacy()
-: Converter()
-, m_jarPaths() {}
-
-void ConverterLegacy::convertExternalJar(const std::string& value) {
-    std::istringstream stream(value);
-    std::string jar;
-
-    while (std::getline(stream, jar, ':')) {
-        m_jarPaths.insert(jar);
-    }
-}
-
-void ConverterLegacy::convertJvmOption(const std::string& value) {
-    std::string::size_type start = 0, delim = 0;
-    while ((start = value.find_first_not_of(m_whitespace, delim)) != std::string::npos) {
-        delim = value.find_first_of(m_whitespace, start);
-        const std::string::size_type len = (std::string::npos == delim) ?  std::string::npos : delim - start;
-        m_jvmOptions.push_back(value.substr(start, len));
-    }
-}
-
-
-void ConverterLegacy::iterateJarPaths(Converter::tJarIteratorCallback callback) const {
-    std::for_each(m_jarPaths.begin(), m_jarPaths.end(), callback);
-}
-
-
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
diff --git a/exaudfclient/base/javacontainer/script_options/converter_legacy.h b/exaudfclient/base/javacontainer/script_options/converter_legacy.h
deleted file mode 100644
index 6fb8abd..0000000
--- a/exaudfclient/base/javacontainer/script_options/converter_legacy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef SCRIPTOPTIONLINEPARSERCONVERTERLEGACY_H
-#define SCRIPTOPTIONLINEPARSERCONVERTERLEGACY_H 1
-
-#include <string>
-#include <vector>
-#include <set>
-#include <memory>
-
-#include "javacontainer/script_options/converter.h"
-
-
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-/**
- * This class is a specialization for the generic converter class.
- * It implements conversion of the jar option according to the requirements in the old
- * parser implementation.
- */
-class ConverterLegacy : public Converter {
-
-    public:
-        ConverterLegacy();
-    
-        void convertExternalJar(const std::string & value) override;
-
-        void convertJvmOption(const std::string & value)  override;
-
-        void iterateJarPaths(tJarIteratorCallback callback) const override;
-
-    private:
-
-        std::set<std::string> m_jarPaths;
-
-};
-
-
-
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
-
-#endif //SCRIPTOPTIONLINEPARSERCONVERTER_H
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/script_options/converter_v2.cc b/exaudfclient/base/javacontainer/script_options/converter_v2.cc
deleted file mode 100644
index 9f279f4..0000000
--- a/exaudfclient/base/javacontainer/script_options/converter_v2.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "javacontainer/script_options/converter_v2.h"
-#include "javacontainer/script_options/string_ops.h"
-#include "javacontainer/script_options/parser_ctpg_jvm_options_parser.h"
-#include <iostream>
-#include <sstream>
-#include <algorithm>
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-ConverterV2::ConverterV2()
-: Converter()
-, m_jarPaths() {}
-
-void ConverterV2::convertExternalJar(const std::string & value) {
-    std::istringstream stream(value);
-    std::string jar;
-
-    while (std::getline(stream, jar, ':')) {
-        m_jarPaths.push_back(jar);
-    }
-}
-
-
-void ConverterV2::convertJvmOption(const std::string & value) {
-    JvmOptionsCTPG::parseJvmOptions(value, m_jvmOptions);
-}
-
-void ConverterV2::iterateJarPaths(Converter::tJarIteratorCallback callback) const {
-    std::for_each(m_jarPaths.begin(), m_jarPaths.end(), callback);
-}
-
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
diff --git a/exaudfclient/base/javacontainer/script_options/converter_v2.h b/exaudfclient/base/javacontainer/script_options/converter_v2.h
deleted file mode 100644
index 8807d90..0000000
--- a/exaudfclient/base/javacontainer/script_options/converter_v2.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef SCRIPTOPTIONLINEPARSERCONVERTERV2_H
-#define SCRIPTOPTIONLINEPARSERCONVERTERV2_H 1
-
-#include <string>
-#include <vector>
-#include <memory>
-
-#include "javacontainer/script_options/converter.h"
-
-
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-/**
- * This class is a specialization for the generic converter class.
- * It implements conversion of the jar option according to the requirements in the new
- * parser implementation.
- */
-class ConverterV2 : public Converter {
-
-    public:
-        ConverterV2();
-    
-        void convertExternalJar(const std::string & value) override;
-
-        void convertJvmOption(const std::string & value)  override;
-
-        void iterateJarPaths(tJarIteratorCallback callback) const override;
-
-    private:
-        
-        std::vector<std::string> m_jarPaths;
-
-};
-
-
-
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
-
-#endif //SCRIPTOPTIONLINEPARSERCONVERTER_H
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/script_options/distinct_script_set.cc b/exaudfclient/base/javacontainer/script_options/distinct_script_set.cc
deleted file mode 100644
index 34898ec..0000000
--- a/exaudfclient/base/javacontainer/script_options/distinct_script_set.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "javacontainer/script_options/distinct_script_set.h"
-#include <string.h>
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-
-bool DistinctScriptSet::addScript(const char *script) {
-    std::string strScript = std::string(script);
-    return m_importedScripts.insert(strScript).second;
-}
-
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
diff --git a/exaudfclient/base/javacontainer/script_options/distinct_script_set.h b/exaudfclient/base/javacontainer/script_options/distinct_script_set.h
deleted file mode 100644
index 081681b..0000000
--- a/exaudfclient/base/javacontainer/script_options/distinct_script_set.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef SCRIPTOPTIONLINEPARSERCHECKSUM_H
-#define SCRIPTOPTIONLINEPARSERCHECKSUM_H 1
-
-#include <string>
-#include <vector>
-#include <unordered_set>
-
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-class DistinctScriptSet {
-
-public:
-    DistinctScriptSet() = default;
-
-    bool addScript(const char *script);
-
-private:
-    std::unordered_set<std::string> m_importedScripts;
-};
-
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
-
-#endif //SCRIPTOPTIONLINEPARSERCHECKSUM_H
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/script_options/extractor.h b/exaudfclient/base/javacontainer/script_options/extractor.h
deleted file mode 100644
index 8d1f669..0000000
--- a/exaudfclient/base/javacontainer/script_options/extractor.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef SCRIPTOPTIONLINEPEXTRACTOR_H
-#define SCRIPTOPTIONLINEPEXTRACTOR_H 1
-
-#include <string>
-#include <vector>
-#include <functional>
-
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-/**
- * Abstract interface for the Extractor class.
- * Defines methods to extract the Java options from the script code.
- * The extraction process searches for the known Java Options and handles them appropriatly.
- * The script code is then modified, where the found options are removed.
- * The interface defines methods to access the found Jar- and JvmOption options.
- * The scriptclass and import options are processed internally by the respective extractor implementation.
- */
-struct Extractor {
-
-    typedef std::function<void(const std::string &option)> tJarIteratorCallback;
-
-    virtual ~Extractor() {}
-
-    /**
-     * Access the found Jar paths. For each found jar path the given callback function is called with the jar option as argument.
-     */
-    virtual void iterateJarPaths(tJarIteratorCallback callback) const = 0;
-
-    /**
-     * Access the Jvm option options. The extractor implementations must store the found Jvm Options in a std::vector.
-     * The vector is returned as rvalue.
-     */
-    virtual std::vector<std::string>&& moveJvmOptions() = 0;
-
-    /**
-     * Run the extraction. This will:
-     * 1. Add the first `scriptclass` option to the list of Jvm options.
-     * 2. Replace and (nested) reference of an `import` script
-     * 3. Find and store all Jar options
-     * 4. Find and store all `jvmoption` options
-     * 5. Remove `scriptclass`, `jar`, `import` and `jvmoption` from the script code. The behavior is implementation specific.
-     */
-    virtual void extract(std::string & scriptCode) = 0;
-};
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
-
-#endif //SCRIPTOPTIONLINEPEXTRACTOR_H
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/script_options/extractor_impl.cc b/exaudfclient/base/javacontainer/script_options/extractor_impl.cc
deleted file mode 100644
index b156d44..0000000
--- a/exaudfclient/base/javacontainer/script_options/extractor_impl.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "javacontainer/script_options/extractor_impl.h"
-#include "javacontainer/script_options/parser.h"
-
-#include "utils/debug_message.h"
-#include <iostream>
-
-#define EXTR_DBG_FUNC_CALL(f) DBG_FUNC_CALL(std::cerr, f)
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-template<typename TParser, typename TConverter>
-ExtractorImpl<TParser, TConverter>::ExtractorImpl(std::unique_ptr<SwigFactory> swigFactory)
-: m_parser(std::move(swigFactory))
-, m_converter() {}
-
-template<typename TParser, typename TConverter>
-void ExtractorImpl<TParser, TConverter>::iterateJarPaths(Extractor::tJarIteratorCallback callback) const {
-    return m_converter.iterateJarPaths(callback);
-}
-
-template<typename TParser, typename TConverter>
-std::vector<std::string>&& ExtractorImpl<TParser, TConverter>::moveJvmOptions() {
-    return std::move(m_converter.moveJvmOptions());
-}
-
-template<typename TParser, typename TConverter>
-void ExtractorImpl<TParser, TConverter>::extract(std::string & scriptCode) {
-    m_parser.prepareScriptCode(scriptCode);
-    EXTR_DBG_FUNC_CALL(m_parser.parseForScriptClass( [&](const std::string& value){
-            EXTR_DBG_FUNC_CALL(m_converter.convertScriptClassName(value)); // To be called before scripts are imported. Otherwise, the script classname from an imported script could be used
-        }));
-    EXTR_DBG_FUNC_CALL(m_parser.extractImportScripts());
-    EXTR_DBG_FUNC_CALL(m_parser.parseForJvmOptions( [&](const std::string& value){
-            EXTR_DBG_FUNC_CALL(m_converter.convertJvmOption(value));
-        }));
-
-    EXTR_DBG_FUNC_CALL(m_parser.parseForExternalJars( [&](const std::string& value){
-            EXTR_DBG_FUNC_CALL(m_converter.convertExternalJar(value));
-        }));
-
-    scriptCode = std::move(m_parser.getScriptCode());
-}
-
-
-// Explict class template instantiations
-template class ExtractorImpl<ScriptOptionLinesParserLegacy, ConverterLegacy>;
-template class ExtractorImpl<ScriptOptionLinesParserCTPG, ConverterV2>;
-
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
diff --git a/exaudfclient/base/javacontainer/script_options/extractor_impl.h b/exaudfclient/base/javacontainer/script_options/extractor_impl.h
deleted file mode 100644
index e65fe5a..0000000
--- a/exaudfclient/base/javacontainer/script_options/extractor_impl.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef SCRIPTOPTIONLINEPEXTRACTORIMPL_H
-#define SCRIPTOPTIONLINEPEXTRACTORIMPL_H 1
-
-#include <string>
-#include <vector>
-#include <set>
-
-
-#include "javacontainer/script_options/extractor.h"
-#include "javacontainer/script_options/converter_legacy.h"
-#include "javacontainer/script_options/converter_v2.h"
-#include "javacontainer/script_options/parser_ctpg.h"
-#include "javacontainer/script_options/parser_legacy.h"
-#include "swig_factory/swig_factory.h"
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-/**
- * Concrete implementation for the Extractor class.
- * Given template parameter TParser and TConverter define concrete behavior.
- */
-template<typename TParser, typename TConverter>
-class ExtractorImpl : public Extractor {
-
-    public:
-
-        ExtractorImpl(std::unique_ptr<SwigFactory> swigFactory);
-
-        virtual void iterateJarPaths(tJarIteratorCallback callback) const override;
-        std::vector<std::string>&& moveJvmOptions() override;
-
-        void extract(std::string & scriptCode);
-
-    private:
-        TParser m_parser;
-        TConverter m_converter;
-};
-
-typedef ExtractorImpl<ScriptOptionLinesParserLegacy, ConverterLegacy> tExtractorLegacy;
-typedef ExtractorImpl<ScriptOptionLinesParserCTPG, ConverterV2> tExtractorV2;
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
-
-#endif //SCRIPTOPTIONLINEPEXTRACTORIMPL_H
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/script_options/keywords.cc b/exaudfclient/base/javacontainer/script_options/keywords.cc
deleted file mode 100644
index 4ac2aff..0000000
--- a/exaudfclient/base/javacontainer/script_options/keywords.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "javacontainer/script_options/keywords.h"
-#include <string_view>
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-Keywords::Keywords(bool withScriptOptionsPrefix)
-: m_jarKeyword()
-, m_scriptClassKeyword()
-, m_importKeyword()
-, m_jvmKeyword() {
-    const std::string_view jar{"%jar"};
-    const std::string_view scriptClass{"%scriptclass"};
-    const std::string_view import{"%import"};
-    const std::string_view jvm{"%jvmoption"};
-    if (withScriptOptionsPrefix) {
-        m_jarKeyword = jar;
-        m_scriptClassKeyword = scriptClass;
-        m_importKeyword = import;
-        m_jvmKeyword = jvm;
-    } else {
-        m_jarKeyword.assign(jar.substr(1));
-        m_scriptClassKeyword.assign(scriptClass.substr(1));
-        m_importKeyword.assign(import.substr(1));
-        m_jvmKeyword.assign(jvm.substr(1));
-    }
-}
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
-
diff --git a/exaudfclient/base/javacontainer/script_options/keywords.h b/exaudfclient/base/javacontainer/script_options/keywords.h
deleted file mode 100644
index 314bf5b..0000000
--- a/exaudfclient/base/javacontainer/script_options/keywords.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef SCRIPTOPTIONLINEKEYWORDS_H
-#define SCRIPTOPTIONLINEKEYWORDS_H 1
-
-#include <string>
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-class Keywords {
-    public:
-        Keywords(bool withScriptOptionsPrefix);
-        const std::string & scriptClassKeyword() { return m_scriptClassKeyword; }
-        const std::string & importKeyword() { return m_importKeyword; }
-        const std::string & jvmKeyword() { return m_jvmKeyword; }
-        const std::string & jarKeyword() { return m_jarKeyword; }
-    private:
-        std::string m_jarKeyword;
-        std::string m_scriptClassKeyword;
-        std::string m_importKeyword;
-        std::string m_jvmKeyword;
-};
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
-
-
-#endif // SCRIPTOPTIONLINEKEYWORDS_H
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/script_options/parser.h b/exaudfclient/base/javacontainer/script_options/parser.h
deleted file mode 100644
index abb497f..0000000
--- a/exaudfclient/base/javacontainer/script_options/parser.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef SCRIPTOPTIONLINEPARSER_H
-#define SCRIPTOPTIONLINEPARSER_H 1
-
-#include <string>
-#include <vector>
-#include <functional>
-
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-struct ScriptOptionsParser {
-    virtual ~ScriptOptionsParser() {};
-    /*
-    Passes the script code for parsing to the parser. The parser might modify the script code, because it will remove
-    known options.
-    */
-    virtual void prepareScriptCode(const std::string & scriptCode) = 0;
-    /*
-    Searches for script class option.
-    If the option is found, the function removes the option from "scriptCode" and calls "callback" with the option value and position
-    within "scriptCode".
-    */
-    virtual void parseForScriptClass(std::function<void(const std::string &option)> callback) = 0;
-    /*
-    Searches for JVM options.
-    If an option is found, the function removes the option from "scriptCode" and calls "callback" with the option value and position
-    within "scriptCode".
-    */
-    virtual void parseForJvmOptions(std::function<void(const std::string &option)> callback) = 0;
-
-    /*
-    Searches for External Jar.
-    If an option is found, the function removes the option from "scriptCode" and calls "callback" with the option value and position
-    within "scriptCode".
-    */
-    virtual void parseForExternalJars(std::function<void(const std::string &option)> callback) = 0;
-
-    /*
-     Searches for the "%import" options and embeds the respective imported script code at the same location as
-     the option in the script code.
-    */
-    virtual void extractImportScripts() = 0;
-
-    /*
-     Returns the (eventually modified) script code.
-    */
-    virtual std::string && getScriptCode() = 0;
-};
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
-
-
-#endif //SCRIPTOPTIONLINEPARSER_H
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/script_options/parser_ctpg.cc b/exaudfclient/base/javacontainer/script_options/parser_ctpg.cc
deleted file mode 100644
index 6209a78..0000000
--- a/exaudfclient/base/javacontainer/script_options/parser_ctpg.cc
+++ /dev/null
@@ -1,162 +0,0 @@
-#include "javacontainer/script_options/parser_ctpg.h"
-#include "javacontainer/script_options/parser_ctpg_script_importer.h"
-#include "utils/exceptions.h"
-#include "script_options_parser/exception.h"
-#include "swig_factory/swig_factory.h"
-#include "javacontainer/script_options/string_ops.h"
-#include <sstream>
-#include <set>
-
-
-namespace ctpg_parser = ExecutionGraph::OptionsLineParser::CTPG;
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-ScriptOptionLinesParserCTPG::ScriptOptionLinesParserCTPG(std::unique_ptr<SwigFactory> swigFactory)
-: m_scriptCode()
-, m_keywords(false)
-, m_needParsing(true)
-, m_swigFactory(std::move(swigFactory)) {}
-
-void ScriptOptionLinesParserCTPG::prepareScriptCode(const std::string & scriptCode) {
-    m_scriptCode = scriptCode;
-}
-
-void ScriptOptionLinesParserCTPG::parseForScriptClass(std::function<void(const std::string &option)> callback) {
-    try {
-        parseForSingleOption(m_keywords.scriptClassKeyword(), [&](const std::string &option) {
-            std::string trimmedValue(option);
-            StringOps::trim(trimmedValue);
-            callback(trimmedValue);
-        });
-    } catch(const ExecutionGraph::OptionParserException& ex) {
-        Utils::rethrow(ex, "F-UDF-CL-SL-JAVA-1623");
-    }
-}
-
-void ScriptOptionLinesParserCTPG::parseForJvmOptions(std::function<void(const std::string &option)> callback) {
-    try {
-        parseForMultipleOption(m_keywords.jvmKeyword(), callback);
-    } catch(const ExecutionGraph::OptionParserException& ex) {
-        Utils::rethrow(ex, "F-UDF-CL-SL-JAVA-1624");
-    }
-}
-
-void ScriptOptionLinesParserCTPG::parseForExternalJars(std::function<void(const std::string &option)> callback) {
-    try {
-        parseForMultipleOption(m_keywords.jarKeyword(), [callback] (const std::string &option) {
-            std::string formattedValue(option);
-            StringOps::replaceTrailingEscapeWhitespaces(formattedValue);
-            callback(formattedValue);
-        });
-    } catch(const ExecutionGraph::OptionParserException& ex) {
-        Utils::rethrow(ex, "F-UDF-CL-SL-JAVA-1625");
-    }
-}
-
-void ScriptOptionLinesParserCTPG::extractImportScripts() {
-
-    try {
-        parse();
-    } catch(const ExecutionGraph::OptionParserException& ex) {
-        Utils::rethrow(ex, "F-UDF-CL-SL-JAVA-1626");
-    }
-
-    const auto optionIt = m_foundOptions.find(m_keywords.importKeyword());
-    if (optionIt != m_foundOptions.end()) {
-        CTPG::ScriptImporter scriptImporter(*m_swigFactory, m_keywords);
-        scriptImporter.importScript(m_scriptCode, m_foundOptions);
-        //The imported scripts will change the location of the other options in m_foundOptions
-        //Also there might be new JVM / External Jar options
-        //=> We need to clear the option map and reset the parser.
-        m_foundOptions.clear();
-        m_needParsing = true;
-    }
-}
-
-std::string && ScriptOptionLinesParserCTPG::getScriptCode() {
-    try {
-        parse();
-    } catch(const ExecutionGraph::OptionParserException& ex) {
-        Utils::rethrow(ex, "F-UDF-CL-SL-JAVA-1627");
-    }
-    //Remove all options from script code in reverse order
-    struct option_location {
-        size_t pos;
-        size_t len;
-    };
-    struct comp {
-        bool operator()(option_location a, option_location b) const {
-            return a.pos > b.pos;
-        }
-    };
-    std::set<option_location, comp> option_locations;
-    for (const auto & option: m_foundOptions) {
-        for (const auto & option_loc: option.second) {
-            option_location loc = { .pos = option_loc.idx_in_source, .len = option_loc.size};
-            option_locations.insert(loc);
-        }
-    }
-    for (const auto option_loc: option_locations) {
-        m_scriptCode.erase(option_loc.pos, option_loc.len);
-    }
-    return std::move(m_scriptCode);
-}
-
-void ScriptOptionLinesParserCTPG::parse() {
-    if (m_needParsing) {
-        if(!m_foundOptions.empty()) {
-            throw std::logic_error(
-                "F-UDF-CL-SL-JAVA-1620 Internal error. Parser result is not empty. "
-                "Please open a bug ticket at https://github.com/exasol/script-languages-release/issues/new.");
-        }
-        try {
-            ExecutionGraph::OptionsLineParser::CTPG::parseOptions(m_scriptCode, m_foundOptions);
-        } catch(const ExecutionGraph::OptionParserException& ex) {
-            Utils::rethrow(ex, "F-UDF-CL-SL-JAVA-1621");
-        }
-
-        m_needParsing = false;
-
-        //Check for unknown options
-        for (const auto & option: m_foundOptions) {
-            if (m_keywords.jarKeyword() != option.first &&
-                m_keywords.scriptClassKeyword() != option.first  &&
-                m_keywords.importKeyword() != option.first  &&
-                m_keywords.jvmKeyword() != option.first) {
-                    std::stringstream ss;
-                    ss << "F-UDF-CL-SL-JAVA-1622 " << "Unexpected option: " << option.first;
-                    throw std::invalid_argument(ss.str());
-                }
-        }
-    }
-}
-
-void ScriptOptionLinesParserCTPG::parseForSingleOption(const std::string key, std::function<void(const std::string &option)> callback) {
-    parse();
-    const auto optionIt = m_foundOptions.find(key);
-    if (optionIt != m_foundOptions.end()) {
-        if (optionIt->second.size() != 1) {
-            std::stringstream ss;
-            ss << "F-UDF-CL-SL-JAVA-1628 found " << optionIt->second.size() << " instances for script option key '" << key << "' but expected at most one." << std::endl;
-            throw std::invalid_argument(ss.str());
-        }
-        callback(optionIt->second[0].value);
-    }
-}
-
-void ScriptOptionLinesParserCTPG::parseForMultipleOption(const std::string key, std::function<void(const std::string &option)> callback) {
-    parse();
-    const auto optionIt = m_foundOptions.find(key);
-    if (optionIt != m_foundOptions.end()) {
-        for (const auto & option : optionIt->second) {
-            callback(option.value);
-        }
-    }
-}
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
diff --git a/exaudfclient/base/javacontainer/script_options/parser_ctpg.h b/exaudfclient/base/javacontainer/script_options/parser_ctpg.h
deleted file mode 100644
index 1f7bad8..0000000
--- a/exaudfclient/base/javacontainer/script_options/parser_ctpg.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef SCRIPTOPTIONLINEPARSERCTPGY_H
-#define SCRIPTOPTIONLINEPARSERCTPGY_H 1
-
-#include "javacontainer/script_options/parser.h"
-#include "javacontainer/script_options/keywords.h"
-#include "script_options_parser/ctpg/script_option_lines_ctpg.h"
-#include <memory>
-
-namespace SWIGVMContainers {
-
-struct SwigFactory;
-
-namespace JavaScriptOptions {
-
-class ScriptOptionLinesParserCTPG : public ScriptOptionsParser {
-
-    public:
-        ScriptOptionLinesParserCTPG(std::unique_ptr<SwigFactory> swigFactory);
-
-        virtual ~ScriptOptionLinesParserCTPG() {};
-
-        void prepareScriptCode(const std::string & scriptCode) override;
-
-        void parseForScriptClass(std::function<void(const std::string &option)> callback) override;
-
-        void parseForJvmOptions(std::function<void(const std::string &option)> callback) override;
-
-        void parseForExternalJars(std::function<void(const std::string &option)> callback) override;
-
-        void extractImportScripts() override;
-
-        std::string && getScriptCode() override;
-
-    private:
-        void parse();
-
-        void parseForSingleOption(const std::string key, std::function<void(const std::string &option)> callback);
-        void parseForMultipleOption(const std::string key, std::function<void(const std::string &option)> callback);
-
-        void importScripts(SwigFactory & swigFactory);
-
-    private:
-        std::string m_scriptCode;
-        Keywords m_keywords;
-        ExecutionGraph::OptionsLineParser::CTPG::options_map_t m_foundOptions;
-        bool m_needParsing;
-        std::unique_ptr<SwigFactory> m_swigFactory;
-};
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
-
-#endif //SCRIPTOPTIONLINEPARSERCTPGY_H
diff --git a/exaudfclient/base/javacontainer/script_options/parser_ctpg_jvm_options_parser.cc b/exaudfclient/base/javacontainer/script_options/parser_ctpg_jvm_options_parser.cc
deleted file mode 100644
index 826af38..0000000
--- a/exaudfclient/base/javacontainer/script_options/parser_ctpg_jvm_options_parser.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-#include "javacontainer/script_options/parser_ctpg_jvm_options_parser.h"
-#include "script_options_parser/ctpg/ctpg.hpp"
-#include <sstream>
-
-using namespace exaudf_ctpg;
-using namespace exaudf_ctpg::ftors;
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-namespace JvmOptionsCTPG {
-
-
-const auto to_options(std::string&& e)
-{
-    tJvmOptions options{e};
-    return options;
-}
-
-auto&& add_option(std::string&& e, tJvmOptions&& ob)
-{
-    ob.push_back(std::move(e));
-    return std::move(ob);
-}
-
-auto convert_escape_sequence(std::string_view escape_seq)
-{
-    if (escape_seq == R"_(\ )_") {
-        return std::string_view(" ");
-    } else if (escape_seq == R"_(\t)_") {
-        return std::string_view("\t");
-    } else if (escape_seq == R"_(\f)_") {
-        return std::string_view("\f");
-    } else if (escape_seq == R"_(\v)_") {
-        return std::string_view("\v");
-    } else if (escape_seq == R"_(\\)_") {
-        return std::string_view("\\");
-    } else {
-        throw std::invalid_argument(std::string("Internal parser error: Unexpected escape sequence " + std::string(escape_seq)));
-    }
-}
-
-
-constexpr char not_separator_pattern[] = R"_([^ \x09\x0c\x0b])_";
-constexpr char whitespaces_pattern[] = R"_([ \x09\x0c\x0b]+)_";
-constexpr char escape_pattern[] = R"_(\\\\|\\t|\\ |\\f|\\v)_";
-
-constexpr regex_term<not_separator_pattern> not_separator("not_separator");
-constexpr regex_term<whitespaces_pattern> whitespaces("whitespace");
-constexpr regex_term<escape_pattern> escape_seq("escape_seq");
-
-constexpr nterm<tJvmOptions> text("text");
-constexpr nterm<std::string> option_element("option_element");
-
-
-constexpr parser jvm_option_parser(
-    text,
-    terms(escape_seq, not_separator, whitespaces),
-    nterms(text, option_element),
-    rules(
-        text()
-            >= [] () {return tJvmOptions();},
-        text(option_element)
-            >= [](auto&& e) { return to_options(std::move(e)); },
-        text(text, whitespaces)
-            >= [](auto&& ob, skip) { return std::move(ob); },
-        text(text, whitespaces, option_element)
-            >= [](auto&& ob, skip, auto&& e) { return add_option(std::move(e), std::move(ob)); },
-        option_element(not_separator)
-            >= [](auto ns) { return std::string(ns); },
-        option_element(option_element, not_separator)
-            >= [](auto &&ob, auto c) { return std::move(ob.append(c)); },
-        option_element(option_element, escape_seq)
-            >= [](auto &&ob, auto es) { return std::move(ob.append(convert_escape_sequence(es))); }
-    )
-);
-
-
-void parseJvmOptions(const std::string & jvmOptions, tJvmOptions& result) {
-    std::stringstream error_buffer;
-    auto && res = jvm_option_parser.parse(
-        parse_options{}.set_skip_whitespace(false),
-        buffers::string_buffer(jvmOptions.c_str()),
-        error_buffer);
-    if (res.has_value()) {
-        result.insert(result.end(), res.value().begin(), res.value().end());
-    }
-    else {
-        throw std::invalid_argument(error_buffer.str());
-    }
-}
-
-} //namespace JvmOptionsCTPG
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
diff --git a/exaudfclient/base/javacontainer/script_options/parser_ctpg_jvm_options_parser.h b/exaudfclient/base/javacontainer/script_options/parser_ctpg_jvm_options_parser.h
deleted file mode 100644
index 84ee8dd..0000000
--- a/exaudfclient/base/javacontainer/script_options/parser_ctpg_jvm_options_parser.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef SCRIPTOPTIONLINEPARSERCTPGJVMOPTIONSPARSER_H
-#define SCRIPTOPTIONLINEPARSERCTPGJVMOPTIONSPARSER_H 1
-
-#include <vector>
-#include <string>
-
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-namespace JvmOptionsCTPG {
-
-typedef std::vector<std::string> tJvmOptions;
-
-void parseJvmOptions(const std::string & jvmOptions, tJvmOptions& result);
-
-
-
-} //namespace CTPG
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
-
-#endif //SCRIPTOPTIONLINEPARSERCTPGSCRIPTIMPORTER_H
diff --git a/exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.cc b/exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.cc
deleted file mode 100644
index d5daeba..0000000
--- a/exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.cc
+++ /dev/null
@@ -1,111 +0,0 @@
-#include "javacontainer/script_options/parser_ctpg_script_importer.h"
-#include "swig_factory/swig_factory.h"
-#include "utils/debug_message.h"
-#include "utils/exceptions.h"
-#include "script_options_parser/exception.h"
-#include "javacontainer/script_options/string_ops.h"
-
-#include <algorithm>
-#include <iostream>
-#include <sstream>
-
-namespace ctpg_parser = ExecutionGraph::OptionsLineParser::CTPG;
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-namespace CTPG {
-
-ScriptImporter::ScriptImporter(SwigFactory & swigFactory, Keywords & keywords)
-: m_importedScripts()
-, m_swigFactory(swigFactory)
-, m_metaData()
-, m_keywords(keywords) {}
-
-void ScriptImporter::importScript(std::string & scriptCode,
-                                    ctpg_parser::options_map_t & options) {
-    importScript(scriptCode, options, 0);
-}
-
-void ScriptImporter::collectImportScripts(const ScriptImporter::OptionValues_t & option_values,
-                                          const size_t recursionDepth,
-                                          std::vector<CollectedScript> &result) {
-    for (const auto & option: option_values) {
-        const char *importScriptCode = findImportScript(option.value);
-        std::string importScriptCodeStr;
-        if (m_importedScripts.addScript(importScriptCode) ) {
-            // Script has not been imported yet
-            // If this imported script contains %import statements
-            // they will be resolved in the next recursion.
-            ctpg_parser::options_map_t newOptions;
-            try {
-                ExecutionGraph::OptionsLineParser::CTPG::parseOptions(importScriptCode, newOptions);
-            } catch(const ExecutionGraph::OptionParserException & ex) {
-                Utils::rethrow(ex, "F-UDF-CL-SL-JAVA-1630");
-            }
-            importScriptCodeStr.assign(importScriptCode);
-            importScript(importScriptCodeStr, newOptions, recursionDepth + 1);
-        }
-        CollectedScript replacedScript = {.script = std::move(importScriptCodeStr), .origPos = option.idx_in_source, .origLen = option.size };
-        result.push_back(std::move(replacedScript));
-    }
-}
-
-void ScriptImporter::replaceImportScripts(std::string & scriptCode,
-                                          const std::vector<CollectedScript> &collectedImportScripts) {
-    //Replace the imported script bodies from end to start.
-    //Doing it in forward order would invalidate the offsets of later import scripts.
-    for (auto optionIt = collectedImportScripts.crbegin(); optionIt != collectedImportScripts.crend(); optionIt++) {
-        scriptCode.replace(optionIt->origPos, optionIt->origLen, optionIt->script);
-    }
-}
-
-
-void ScriptImporter::importScript(std::string & scriptCode,
-                                    ctpg_parser::options_map_t & options,
-                                    const size_t recursionDepth) {
-    const auto optionIt = options.find(std::string(m_keywords.importKeyword()));
-
-    if (recursionDepth >= cMaxRecursionDepth) {
-        throw std::runtime_error("F-UDF-CL-SL-JAVA-1633: Maximal recursion depth for importing scripts reached.");
-    }
-    if (optionIt != options.end()) {
-        m_importedScripts.addScript(scriptCode.c_str());
-        //Sort options from first in script to last in script
-        std::sort(optionIt->second.begin(), optionIt->second.end(),
-                    [](const ctpg_parser::ScriptOption& first, const ctpg_parser::ScriptOption& second)
-                                  {
-                                      return first.idx_in_source < second.idx_in_source;
-                                  });
-        std::vector<CollectedScript> collectedScripts;
-        collectedScripts.reserve(optionIt->second.size());
-        //In order to continue compatibility with legacy implementation
-        //we must collect import scripts in forward direction but then replace in reverse direction.
-        collectImportScripts(optionIt->second, recursionDepth, collectedScripts);
-        replaceImportScripts(scriptCode, collectedScripts);
-    }
-}
-
-const char* ScriptImporter::findImportScript(const std::string & scriptKey) {
-    std::string trimmedScriptKey(scriptKey);
-    StringOps::trim(trimmedScriptKey);
-    if (!m_metaData) {
-        m_metaData.reset(m_swigFactory.makeSwigMetadata());
-        if (!m_metaData) {
-            throw std::runtime_error("F-UDF-CL-SL-JAVA-1631: Failure while importing scripts");
-        }
-    }
-    const char *importScriptCode = m_metaData->moduleContent(trimmedScriptKey.c_str());
-    const char *exception = m_metaData->checkException();
-    if (exception) {
-        throw std::runtime_error("F-UDF-CL-SL-JAVA-1632: " + std::string(exception));
-    }
-    return importScriptCode;
-}
-
-} //namespace CTPG
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
diff --git a/exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.h b/exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.h
deleted file mode 100644
index 284a406..0000000
--- a/exaudfclient/base/javacontainer/script_options/parser_ctpg_script_importer.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef SCRIPTOPTIONLINEPARSERCTPGSCRIPTIMPORTER_H
-#define SCRIPTOPTIONLINEPARSERCTPGSCRIPTIMPORTER_H 1
-
-#include "javacontainer/script_options/distinct_script_set.h"
-#include "javacontainer/script_options/keywords.h"
-#include "exaudflib/swig/swig_meta_data.h"
-#include "script_options_parser/ctpg/script_option_lines_ctpg.h"
-#include <memory>
-
-
-namespace SWIGVMContainers {
-
-    struct SwigFactory;
-
-namespace JavaScriptOptions {
-
-namespace CTPG {
-
-
-
-class ScriptImporter {
-
-    public:
-        ScriptImporter(SwigFactory & swigFactory, Keywords & keywords);
-
-        void importScript(std::string & scriptCode, ExecutionGraph::OptionsLineParser::CTPG::options_map_t & options);
-
-    private:
-         struct CollectedScript {
-            CollectedScript(CollectedScript&&) = default;
-            std::string script;
-            size_t origPos;
-            size_t origLen;
-        };
-
-        typedef ExecutionGraph::OptionsLineParser::CTPG::options_map_t::mapped_type OptionValues_t;
-
-        void importScript(std::string & scriptCode,
-                            ExecutionGraph::OptionsLineParser::CTPG::options_map_t & options,
-                            const size_t recursionDepth);
-         const char* findImportScript(const std::string & scriptKey);
-
-         void collectImportScripts(const OptionValues_t & option_values,
-                                   const size_t recursionDepth,
-                                   std::vector<CollectedScript> &result);
-
-         void replaceImportScripts(std::string & scriptCode,
-                                   const std::vector<CollectedScript> &collectedImportScripts);
-
-        DistinctScriptSet m_importedScripts;
-        SwigFactory & m_swigFactory;
-        std::unique_ptr<SWIGMetadataIf> m_metaData;
-        Keywords & m_keywords;
-        //The empirical maximal value for recursion depth is ~18000. So we add a little bit extra to have some buffer.
-        const size_t cMaxRecursionDepth = 10000U;
-};
-
-} //namespace CTPG
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
-
-#endif //SCRIPTOPTIONLINEPARSERCTPGSCRIPTIMPORTER_H
diff --git a/exaudfclient/base/javacontainer/script_options/parser_legacy.cc b/exaudfclient/base/javacontainer/script_options/parser_legacy.cc
deleted file mode 100644
index 3da5b93..0000000
--- a/exaudfclient/base/javacontainer/script_options/parser_legacy.cc
+++ /dev/null
@@ -1,198 +0,0 @@
-#include "javacontainer/script_options/parser_legacy.h"
-#include "javacontainer/script_options/distinct_script_set.h"
-#include "script_options_parser/legacy/script_option_lines.h"
-#include "exaudflib/swig/swig_meta_data.h"
-#include "swig_factory/swig_factory.h"
-#include "utils/exceptions.h"
-#include "script_options_parser/exception.h"
-
-#include <memory>
-
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-ScriptOptionLinesParserLegacy::ScriptOptionLinesParserLegacy(std::unique_ptr<SwigFactory> swigFactory)
-: m_whitespace(" \t\f\v")
-, m_lineend(";")
-, m_scriptCode()
-, m_keywords(true)
-, m_swigFactory(std::move(swigFactory)) {}
-
-void ScriptOptionLinesParserLegacy::prepareScriptCode(const std::string & scriptCode) {
-    m_scriptCode = scriptCode;
-}
-
-void ScriptOptionLinesParserLegacy::extractImportScripts() {
-    std::unique_ptr<SWIGMetadataIf> metaData;
-    // Attention: We must hash the parent script before modifying it (adding the
-    // package definition). Otherwise we don't recognize if the script imports its self
-    DistinctScriptSet importedScripts;
-    importedScripts.addScript(m_scriptCode.c_str());
-    /*
-    The following while loop iteratively replaces import scripts in the script code. Each replacement is done in two steps:
-    1. Remove the "%import ..." option in the script code
-    2. Insert the new script code at the same location
-    It can happen that the imported scripts have again an "%import ..." option.
-    Those cases will be handled in the next iteration of the while loop, because the parser searches the options in
-    each iteration from the beginning of the (then modified) script code.
-    For example, lets assume the following Jave UDF, stored in member variable 'm_scriptCode':
-        %import other_script_A;
-        class MyJavaUdf {
-            static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                ctx.emit(\"Success!\");\n"
-            }
-        };
-    and 'other_script_A' is defined as (which will be retrieved over SWIGMetadata.moduleContent()):
-        %import other_script_B;
-        class OtherClassA {
-            static void doSomething() {
-            }
-        };
-    and other_script_B as:
-        %import other_script_A;
-        class OtherClassB {
-            static void doSomething() {
-            }
-        };
-    The first iteration of the while loop would modify the member variable m_scriptCode to:
-        %import other_script_B;
-        class OtherClassA {
-            static void doSomething() {
-            }
-        };
-        class MyJavaUdf {
-            static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                ctx.emit(\"Success!\");\n"
-            }
-        };
-    The second iteration of the while loop would modify the member variable m_scriptCode to:
-        The first iteration of the while loop would modify the member variable m_scriptCode to:
-        %import other_script_A;
-        class OtherClassB {
-            static void doSomething() {
-            }
-        };
-        class OtherClassA {
-            static void doSomething() {
-            }
-        };
-        class MyJavaUdf {
-            static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                ctx.emit(\"Success!\");\n"
-            }
-        };
-    The third iteration of the while loop would modify the member variable m_scriptCode to:
-        class OtherClassB {
-            static void doSomething() {
-            }
-        };
-        class OtherClassA {
-            static void doSomething() {
-            }
-        };
-        class MyJavaUdf {
-            static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {
-                ctx.emit(\"Success!\");\n"
-            }
-        };
-    because the content of "other_script_A" is already stored in the DistinctScriptSet,
-    and the parser only removes the script options keyword, but does not insert again the code of other_script_A.
-    The fourth iteration of the while loop would detect no further import option keywords and would break the loop.
-    */
-    while (true) {
-        std::string newScript;
-        size_t scriptPos;
-        try {
-            parseForSingleOption(m_keywords.importKeyword(),
-                                 [&](const std::string& value, size_t pos){scriptPos = pos; newScript = value;});
-        } catch (const ExecutionGraph::OptionParserException & ex) {
-            Utils::rethrow(ex, "F-UDF-CL-SL-JAVA-1614");
-        }
-        if (!newScript.empty()) {
-            if (!metaData) {
-                metaData.reset(m_swigFactory->makeSwigMetadata());
-                if (!metaData)
-                    throw std::runtime_error("F-UDF-CL-SL-JAVA-1615: Failure while importing scripts");
-            }
-            const char *importScriptCode = metaData->moduleContent(newScript.c_str());
-            const char *exception = metaData->checkException();
-            if (exception)
-                throw std::runtime_error("F-UDF-CL-SL-JAVA-1616: " + std::string(exception));
-            if (importedScripts.addScript(importScriptCode)) {
-                // Script has not been imported yet
-                // If this imported script contains %import statements
-                // they will be resolved in the next iteration of the while loop.
-                m_scriptCode.insert(scriptPos, importScriptCode);
-            }
-        } else {
-            break;
-        }
-    }
-}
-
-void ScriptOptionLinesParserLegacy::parseForScriptClass(std::function<void(const std::string &option)> callback) {
-    try {
-    parseForSingleOption(m_keywords.scriptClassKeyword(),
-                            [&](const std::string& value, size_t pos){callback(value);});
-    } catch (const ExecutionGraph::OptionParserException& ex) {
-        Utils::rethrow(ex, "F-UDF-CL-SL-JAVA-1610");
-    }
-}
-
-void ScriptOptionLinesParserLegacy::parseForJvmOptions(std::function<void(const std::string &option)> callback) {
-    try {
-       parseForMultipleOptions(m_keywords.jvmKeyword(),
-                                [&](const std::string& value, size_t pos){callback(value);});
-    } catch(const ExecutionGraph::OptionParserException& ex) {
-        Utils::rethrow(ex, "F-UDF-CL-SL-JAVA-1612");
-    }
-}
-
-void ScriptOptionLinesParserLegacy::parseForExternalJars(std::function<void(const std::string &option)> callback) {
-    try {
-       parseForMultipleOptions(m_keywords.jarKeyword(),
-                                [&](const std::string& value, size_t pos){callback(value);});
-    } catch(const ExecutionGraph::OptionParserException& ex) {
-        Utils::rethrow(ex, "F-UDF-CL-SL-JAVA-1613");
-    }
-}
-
-std::string && ScriptOptionLinesParserLegacy::getScriptCode() {
-    return std::move(m_scriptCode);
-}
-
-void ScriptOptionLinesParserLegacy::parseForSingleOption(const std::string & keyword,
-                            std::function<void(const std::string &option, size_t pos)> callback) {
-    size_t pos;
-    try {
-        const std::string option =
-          ExecutionGraph::extractOptionLine(m_scriptCode, keyword, m_whitespace, m_lineend, pos);
-        if (option != "") {
-            callback(option, pos);
-        }
-    } catch(const ExecutionGraph::OptionParserException& ex) {
-        Utils::rethrow(ex, "F-UDF-CL-SL-JAVA-1606");
-    }
-}
-
-void ScriptOptionLinesParserLegacy::parseForMultipleOptions(const std::string & keyword,
-                            std::function<void(const std::string &option, size_t pos)> callback) {
-    size_t pos;
-    while (true) {
-        try {
-            const std::string option =
-              ExecutionGraph::extractOptionLine(m_scriptCode, keyword, m_whitespace, m_lineend, pos);
-            if (option == "")
-                break;
-            callback(option, pos);
-        } catch(const ExecutionGraph::OptionParserException& ex) {
-            Utils::rethrow(ex, "F-UDF-CL-SL-JAVA-1607");
-        }
-    }
-}
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
diff --git a/exaudfclient/base/javacontainer/script_options/parser_legacy.h b/exaudfclient/base/javacontainer/script_options/parser_legacy.h
deleted file mode 100644
index 6159cff..0000000
--- a/exaudfclient/base/javacontainer/script_options/parser_legacy.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef SCRIPTOPTIONLINEPARSERLEGACY_H
-#define SCRIPTOPTIONLINEPARSERLEGACY_H 1
-
-
-#include "javacontainer/script_options/parser.h"
-#include "javacontainer/script_options/keywords.h"
-
-#include <memory>
-
-namespace SWIGVMContainers {
-
-struct SwigFactory;
-
-namespace JavaScriptOptions {
-
-class ScriptOptionLinesParserLegacy : public ScriptOptionsParser {
-
-    public:
-        ScriptOptionLinesParserLegacy(std::unique_ptr<SwigFactory> swigFactory);
-
-        virtual ~ScriptOptionLinesParserLegacy() {};
-
-        void prepareScriptCode(const std::string & scriptCode) override;
-
-        void parseForScriptClass(std::function<void(const std::string &option)> callback) override;
-
-        void parseForJvmOptions(std::function<void(const std::string &option)> callback) override;
-
-        void parseForExternalJars(std::function<void(const std::string &option)> callback) override;
-
-        void extractImportScripts() override;
-
-        std::string && getScriptCode() override;
-
-    private:
-        void parseForSingleOption(const std::string& key,
-                                        std::function<void(const std::string &option, size_t pos)> callback);
-        void parseForMultipleOptions(const std::string& key,
-                                                std::function<void(const std::string &option, size_t pos)> callback);
-
-    private:
-        const std::string m_whitespace;
-        const std::string m_lineend;
-        std::string m_scriptCode;
-        Keywords m_keywords;
-        std::unique_ptr<SwigFactory> m_swigFactory;
-};
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
-
-
-#endif //SCRIPTOPTIONLINEPARSERLEGACY_H
\ No newline at end of file
diff --git a/exaudfclient/base/javacontainer/script_options/string_ops.cc b/exaudfclient/base/javacontainer/script_options/string_ops.cc
deleted file mode 100644
index d6d6d89..0000000
--- a/exaudfclient/base/javacontainer/script_options/string_ops.cc
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "javacontainer/script_options/string_ops.h"
-#include <regex>
-#include <iostream>
-#include <cstdint>
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-namespace StringOps {
-
-inline uint32_t countBackslashesBackwards(const std::string & s, size_t pos) {
-    uint32_t retVal(0);
-    while (pos >= 0 && s.at(pos--) == '\\') retVal++;
-    return retVal;
-}
-
-inline size_t replaceOnlyBackslashSequencesButKeepChar(std::string & s, size_t backslashStartIdx, size_t nBackslashes) {
-    const uint32_t nHalfBackslashes = (nBackslashes>>1);
-    if (nHalfBackslashes > 0) {
-        s = s.erase(backslashStartIdx, nHalfBackslashes );
-    }
-    const size_t newBackslashEndIdx = backslashStartIdx + nHalfBackslashes;
-    return newBackslashEndIdx + 1; //+1 because of the last None-Whitespace character we need to keep
-}
-
-inline size_t replaceBackslashSequencesAndWhitespaceSequence(std::string & s, size_t backslashStartIdx,
-                                                                size_t nBackslashes, const char* replacement) {
-    const uint32_t nHalfBackslashes = (nBackslashes>>1);
-    s = s.erase(backslashStartIdx, nHalfBackslashes+1 ); //Delete also backslash of whitespace escape sequence
-    const size_t newBackslashEndIdx = backslashStartIdx + nHalfBackslashes;
-    s = s.replace(newBackslashEndIdx, 1, replacement);
-    return newBackslashEndIdx + 1; //+1 because of the replaced whitespace character
-}
-
-inline size_t replaceCharAtPositionAndBackslashes(std::string & s, size_t pos, const char* replacement) {
-    const size_t nBackslashes =  (pos > 0) ? countBackslashesBackwards(s, pos-1) : 0;
-
-    const size_t backslashStartIdx = pos-nBackslashes;
-    if(nBackslashes % 2 == 0) {
-        return replaceOnlyBackslashSequencesButKeepChar(s, backslashStartIdx, nBackslashes);
-    }
-    else {
-        return replaceBackslashSequencesAndWhitespaceSequence(s, backslashStartIdx, nBackslashes, replacement);
-    }
-}
-
-void replaceTrailingEscapeWhitespaces(std::string & s) {
-    if (s.size() > 0) {
-        const size_t lastNoneWhitespaceIdx = s.find_last_not_of(" \t\v\f");
-        if (lastNoneWhitespaceIdx != std::string::npos) {
-            size_t firstWhitespaceAfterNoneWhitespaceIdx = lastNoneWhitespaceIdx + 1;
-            if (s.size() > 1) {
-                if(s[lastNoneWhitespaceIdx] == 't') {
-                    firstWhitespaceAfterNoneWhitespaceIdx = replaceCharAtPositionAndBackslashes(s, lastNoneWhitespaceIdx, "\t");
-                } else if (s[lastNoneWhitespaceIdx] == '\\' && lastNoneWhitespaceIdx < (s.size() - 1) && s.at(lastNoneWhitespaceIdx+1) == ' ') {
-                    firstWhitespaceAfterNoneWhitespaceIdx = replaceCharAtPositionAndBackslashes(s, lastNoneWhitespaceIdx+1, " ");
-                } else if (s[lastNoneWhitespaceIdx] == 'f') {
-                    firstWhitespaceAfterNoneWhitespaceIdx = replaceCharAtPositionAndBackslashes(s, lastNoneWhitespaceIdx, "\f");
-                } else if (s[lastNoneWhitespaceIdx] == 'v') {
-                    firstWhitespaceAfterNoneWhitespaceIdx = replaceCharAtPositionAndBackslashes(s, lastNoneWhitespaceIdx, "\v");
-                }
-            }
-            if (firstWhitespaceAfterNoneWhitespaceIdx != std::string::npos &&
-                firstWhitespaceAfterNoneWhitespaceIdx < s.size()) {
-                s = s.substr(0, firstWhitespaceAfterNoneWhitespaceIdx); //Right Trim the string
-            }
-        } else {
-            s = "";
-        }
-    }
-}
-
-} //namespace StringOps
-
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
diff --git a/exaudfclient/base/javacontainer/script_options/string_ops.h b/exaudfclient/base/javacontainer/script_options/string_ops.h
deleted file mode 100644
index 7da1e53..0000000
--- a/exaudfclient/base/javacontainer/script_options/string_ops.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef SCRIPTOPTIONLINEPARSERSTRINGOPS_H
-#define SCRIPTOPTIONLINEPARSERSTRINGOPS_H 1
-
-#include <string>
-#include <algorithm>
-
-
-
-namespace SWIGVMContainers {
-
-namespace JavaScriptOptions {
-
-namespace StringOps {
-
-//Following code is based on  https://stackoverflow.com/a/217605
-
-inline void ltrim(std::string &s) {
-    s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) {
-        return !std::isspace(ch);
-    }));
-}
-
-inline void rtrim(std::string &s) {
-    s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char ch) {
-        return !std::isspace(ch);
-    }).base(), s.end());
-}
-
-inline void trim(std::string &s) {
-    ltrim(s);
-    rtrim(s);
-}
-
-void replaceTrailingEscapeWhitespaces(std::string & s);
-
-} //namespace StringOps
-
-
-} //namespace JavaScriptOptions
-
-} //namespace SWIGVMContainers
-
-#endif //SCRIPTOPTIONLINEPARSERSTRINGOPS_H
\ No newline at end of file
diff --git a/exaudfclient/base/script_options_parser/BUILD b/exaudfclient/base/script_options_parser/BUILD
deleted file mode 100644
index 907a7d2..0000000
--- a/exaudfclient/base/script_options_parser/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@rules_cc//cc:defs.bzl", "cc_library")
-
-cc_library(
-    name = "exception",
-    hdrs = ["exception.h"]
-)
diff --git a/exaudfclient/base/script_options_parser/ctpg/BUILD b/exaudfclient/base/script_options_parser/ctpg/BUILD
deleted file mode 100644
index 07a551f..0000000
--- a/exaudfclient/base/script_options_parser/ctpg/BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@rules_cc//cc:defs.bzl", "cc_library")
-
-cc_library(
-    name = "script_option_lines_parser_ctpg",
-    hdrs = ["script_option_lines_ctpg.h"],
-    srcs = ["script_option_lines_ctpg.cc","ctpg.hpp"],
-    deps = ["//script_options_parser:exception"],
-    copts= ["-fno-lto"],
-)
diff --git a/exaudfclient/base/script_options_parser/ctpg/ctpg.hpp b/exaudfclient/base/script_options_parser/ctpg/ctpg.hpp
deleted file mode 100644
index fc6a123..0000000
--- a/exaudfclient/base/script_options_parser/ctpg/ctpg.hpp
+++ /dev/null
@@ -1,3434 +0,0 @@
-/**
-
-CTPG Library https://github.com/peter-winter/ctpg
-
-MIT License
-
-Copyright (c) 2021 peter-winter
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-**/
-
-#ifndef CTPG_H
-#define CTPG_H
-
-#include <utility>
-#include <type_traits>
-#include <cstdint>
-#include <limits>
-#include <tuple>
-#include <algorithm>
-#include <vector>
-#include <optional>
-#include <variant>
-#include <string_view>
-#include <ostream>
-
-namespace exaudf_ctpg
-{
-
-using size_t = std::size_t;
-using size8_t = std::uint8_t;
-using size16_t = std::uint16_t;
-using size32_t = std::uint32_t;
-
-template<size_t N>
-using str_table = const char* [N];
-
-constexpr size_t uninitialized = size_t(-1);
-constexpr size16_t uninitialized16 = size16_t(-1);
-constexpr size32_t uninitialized32 = size32_t(-1);
-
-namespace meta
-{
-    template<typename T>
-    struct contains_type
-    {};
-
-    template<typename... T>
-    struct unique_type_list : contains_type<T>...
-    {
-        using variant_type = std::variant<T...>;
-
-        template<typename New>
-        struct insert
-        {
-            static unique_type_list<T...> foo(contains_type<New>*);
-            static unique_type_list<T..., New> foo(...);
-
-            using type = decltype(foo(std::declval<unique_type_list<T...>*>()));
-        };
-
-        template<typename New>
-        typename insert<New>::type operator + (New);
-    };
-
-    template<typename... T>
-    struct unique_types_variant
-    {
-        using unique_list = decltype((std::declval<unique_type_list<>>() + ... + std::declval<T>()));
-        using type = typename unique_list::variant_type;
-    };
-
-    template<typename... T>
-    using unique_types_variant_t = typename unique_types_variant<T...>::type;
-
-    template<typename... T>
-    constexpr int sum_size = (0 + ... + sizeof(T));
-
-    template<typename T>
-    constexpr size_t distinct_values_count = 1 << (sizeof(T) * 8);
-
-    constexpr size_t distinct_chars_count = distinct_values_count<char>;
-
-    template<size_t First, size_t... Rest>
-    struct max
-    {
-        static const size_t value = std::max(First, max<Rest...>::value);
-    };
-
-    template<size_t X>
-    struct max<X>
-    {
-        static const size_t value = X;
-    };
-
-    template<size_t... X>
-    constexpr size_t max_v = max<X...>::value;
-
-    template<size_t... X>
-    constexpr size_t count_zeros = (0 + ... + (X == 0 ? 1 : 0));
-}
-
-namespace stdex
-{
-    template<typename T>
-    struct is_cvector_compatible : std::bool_constant<std::is_default_constructible_v<T> && std::is_trivially_destructible_v<T>>
-    {};
-
-    template<typename T, std::size_t N, typename = void>
-    class cvector
-    {};
-
-    template<typename T, std::size_t N>
-    class cvector<T, N, std::enable_if_t<is_cvector_compatible<T>::value>>
-    {
-    public:
-        using size_type = std::size_t;
-
-        constexpr cvector() :
-            the_data{}, current_size(0)
-        {}
-
-        constexpr cvector(const T& arg, size_t count):
-            the_data{}, current_size(0)
-        {
-            for (size_t i = 0; i < count; ++i)
-                push_back(arg);
-        }
-
-    private:
-        template<typename Derived>
-        struct iterator_base
-        {
-            using it_type = Derived;
-            constexpr it_type* cast() { return static_cast<it_type*>(this); }
-            constexpr const it_type* cast() const { return static_cast<const it_type*>(this); }
-
-            constexpr bool operator == (const it_type& other) const { return cast()->ptr == other.ptr; }
-            constexpr bool operator != (const it_type& other) const { return cast()->ptr != other.ptr; }
-            constexpr it_type operator - (size_type amount) const { return it_type{ cast()->ptr - amount }; }
-            constexpr size_type operator - (const it_type& other) const { return size_type(cast()->ptr - other.ptr); }
-            constexpr it_type operator + (size_type amount) const { return it_type{ cast()->ptr + amount }; }
-            constexpr it_type operator ++(int) { it_type it{ cast()->ptr }; ++(cast()->ptr); return it; }
-            constexpr it_type& operator ++() { ++(cast()->ptr); return *cast(); }
-            constexpr bool operator > (const it_type& other) const { return cast()->ptr > other.ptr; }
-            constexpr bool operator < (const it_type& other) const { return cast()->ptr < other.ptr; }
-        };
-
-    public:
-        struct iterator : iterator_base<iterator>
-        {
-            T* ptr;
-            constexpr iterator(T* ptr) : ptr(ptr) {}
-            constexpr T& operator *() const { return *ptr; }
-        };
-
-        struct const_iterator : iterator_base<const_iterator>
-        {
-            const T* ptr;
-            constexpr const_iterator(const T* ptr) : ptr(ptr) {}
-            constexpr const T& operator *() const { return *ptr; }
-        };
-
-        constexpr const T* data() const { return the_data; }
-        constexpr T* data() { return the_data; }
-        constexpr size_type size() const { return current_size; }
-        constexpr bool empty() const { return current_size == 0; }
-        constexpr void reserve(size_type) const {};
-        constexpr const T& operator[](size_type idx) const { return the_data[idx]; }
-        constexpr T& operator[](size_type idx) { return the_data[idx]; }
-        constexpr void push_back(const T& v) { the_data[current_size++] = v; }
-        constexpr void emplace_back(T&& v) { the_data[current_size++] = std::move(v); }
-        constexpr const T& front() const { return the_data[0]; }
-        constexpr T& front() { return the_data[0]; }
-        constexpr T& back() { return the_data[current_size - 1]; }
-        constexpr const T& back() const { return the_data[current_size - 1]; }
-        constexpr const_iterator begin() const { return const_iterator(the_data); }
-        constexpr const_iterator end() const { return const_iterator(the_data + current_size); }
-        constexpr iterator begin() { return iterator(the_data); }
-        constexpr iterator end() { return iterator(the_data + current_size); }
-        constexpr void clear() { current_size = 0; }
-        constexpr void pop_back() { current_size--; }
-        constexpr iterator erase(iterator first, iterator last)
-        {
-            if (!(first < last))
-                return end();
-            auto from = first < begin() ? begin() : first;
-            auto to = last > end() ? end() : last;
-            size_type diff = to - from;
-            iterator it = to;
-            while (!(it == end()))
-            {
-                *from = std::move(*it);
-                ++from; ++it;
-            }
-            current_size -= diff;
-
-            return end();
-        }
-
-    private:
-        T the_data[N];
-        size_type current_size;
-    };
-
-    template<std::size_t N>
-    class cbitset
-    {
-    public:
-        using size_type = std::size_t;
-        using underlying_type = std::uint64_t;
-
-        constexpr cbitset& set(size_type idx)
-        {
-            check_idx(idx);
-            data[idx / underlying_size] |= (underlying_type(1) << (idx % underlying_size));
-            return *this;
-        }
-
-        constexpr cbitset& set(size_type idx, bool value)
-        {
-            check_idx(idx);
-            data[idx / underlying_size] ^= (-!!value ^ data[idx / underlying_size]) & (underlying_type(1) << (idx % underlying_size));
-            return *this;
-        }
-
-        constexpr cbitset& reset(size_type idx)
-        {
-            check_idx(idx);
-            data[idx / underlying_size] &= ~(underlying_type(1) << (idx % underlying_size));
-            return *this;
-        }
-
-        constexpr cbitset& flip(size_type idx)
-        {
-            check_idx(idx);
-            data[idx / underlying_size] ^= (underlying_type(1) << (idx % underlying_size));
-            return *this;
-        }
-
-        constexpr bool test(size_type idx) const
-        {
-            check_idx(idx);
-            return (data[idx / underlying_size] >> (idx % underlying_size)) & underlying_type(1);
-        }
-
-        constexpr cbitset& flip()
-        {
-            for (auto& d : data)
-                d = ~d;
-            return *this;
-        }
-
-        constexpr cbitset& set()
-        {
-            for (auto& d : data)
-                d = underlying_type(-1);
-            return *this;
-        }
-
-        constexpr cbitset& reset()
-        {
-            for (auto& d : data)
-                d = underlying_type(0);
-            return *this;
-        }
-
-        constexpr size_type size() const
-        {
-            return N;
-        }
-
-    private:
-        constexpr void check_idx(size_type idx) const
-        {
-            if (idx >= N)
-                throw std::runtime_error("Index access out of range");
-        }
-
-        static const size_type underlying_size = sizeof(underlying_type) * 8;
-        static const size_type underlying_count = (N / underlying_size) + ((N % underlying_size) ? 1 : 0);
-        underlying_type data[underlying_count] = {};
-    };
-
-    template<typename T>
-    struct is_cqueue_compatible : std::bool_constant<std::is_default_constructible_v<T> && std::is_trivially_destructible_v<T>>
-    {};
-
-    template<typename T, std::size_t N, typename = void>
-    class cqueue
-    {};
-
-    template<typename T, std::size_t N>
-    class cqueue<T, N, std::enable_if_t<is_cqueue_compatible<T>::value>>
-    {
-    public:
-        constexpr cqueue():
-            data{}, start{0}, end{0}, size_{0}
-        {}
-
-        constexpr void push(const T& v)
-        {
-            if (size_ >= N)
-                throw std::runtime_error("Pushing out of range");
-
-            data[end++] = v;
-            if (end == N)
-                end = 0;
-            size_++;
-        }
-
-        constexpr void pop()
-        {
-            if (empty())
-                throw std::runtime_error("Pop on empty");
-
-            start++;
-            if (start == N)
-                start = 0;
-            size_--;
-        }
-
-        constexpr T& top()
-        {
-            if (empty())
-                throw std::runtime_error("Top on empty");
-            return data[start];
-        }
-
-        constexpr const T& top() const
-        {
-            return std::as_const(*this).top();
-        }
-
-        constexpr bool empty() const
-        {
-            return size_ == 0;
-        }
-
-        constexpr std::size_t size() const
-        {
-            return size_;
-        }
-
-    private:
-        T data[N];
-        std::size_t start;
-        std::size_t end;
-        std::size_t size_;
-    };
-
-    template<typename Container, typename Pred>
-    constexpr Container& sort(Container& c, Pred p)
-    {
-        bool swap = true;
-        while (swap)
-        {
-            swap = false;
-            for (auto i = 0u; i < std::size(c) - 1; i++)
-            {
-                if (p(c[i + 1], c[i]))
-                {
-                    auto x = c[i];
-                    c[i] = c[i + 1];
-                    c[i + 1] = x;
-                    swap = true;
-                }
-            }
-        }
-        return c;
-    }
-}
-
-namespace utils
-{
-    template<typename T, typename... Args>
-    constexpr T construct_default(Args...)
-    {
-        return T();
-    }
-
-    template<typename T, size_t... I>
-    constexpr void copy_array(T *a1, const T* a2, std::index_sequence<I...>)
-    {
-        (void(a1[I] = a2[I]), ...);
-    }
-
-    constexpr size_t char_to_idx(char c)
-    {
-        return static_cast<size_t>(static_cast<unsigned char>(c)) & 0xff;
-    }
-
-    constexpr char idx_to_char(size_t idx)
-    {
-        return static_cast<char>(static_cast<unsigned char>(idx & 0xff));
-    }
-
-    constexpr bool is_printable(char c)
-    {
-        return c >= 0x20 && c <= 0x7e;
-    }
-
-    constexpr bool is_hex_digit(char c)
-    {
-        return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F');
-    }
-
-    constexpr bool is_dec_digit(char c)
-    {
-        return c >= '0' && c <= '9';
-    }
-
-    class char_names
-    {
-    public:
-        const static size_t name_size = 5;
-
-        constexpr char_names()
-        {
-            for (size_t i = 0; i < meta::distinct_chars_count; ++i)
-            {
-                char d[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-                if (idx_to_char(i) > 32 && idx_to_char(i) < 127)
-                {
-                    arr[i][0] = idx_to_char(i);
-                    arr[i][1] = 0;
-                }
-                else
-                {
-                    arr[i][0] = '\\';
-                    arr[i][1] = 'x';
-                    arr[i][2] = d[i / 16];
-                    arr[i][3] = d[i % 16];
-                    arr[i][4] = 0;
-                }
-            }
-        }
-
-        constexpr const char* name(char c) const { return arr[char_to_idx(c)]; }
-
-    private:
-        char arr[meta::distinct_chars_count][name_size] = {};
-    };
-
-    constexpr char_names c_names = {};
-
-    constexpr bool str_equal(const char* str1, const char* str2)
-    {
-        if ((str1 == nullptr) || (str2 == nullptr))
-            throw std::runtime_error("null pointers not allowed here");
-        while (*str1 == *str2)
-        {
-            if (*str1 == 0)
-                return true;
-            str1++; str2++;
-        }
-        return false;
-    }
-
-    template<size_t N>
-    constexpr size_t find_str(const str_table<N>& table, const char* str)
-    {
-        size_t res = 0;
-        for (const auto& n : table)
-        {
-            if (str_equal(n, str))
-                return res;
-            res++;
-        }
-        if (res == N)
-            throw std::runtime_error("string not found");
-        return uninitialized;
-    }
-
-    constexpr size_t find_char(char c, const char* str)
-    {
-        size_t i = 0;
-        while (*str)
-        {
-            if (*str == c)
-                return i;
-            str++; i++;
-        }
-        return uninitialized;
-    }
-
-    constexpr std::size_t str_len(const char* str)
-    {
-        std::size_t i = 0;
-        const char* p = str;
-        while (*p) { ++i; ++p; }
-        return i;
-    }
-
-    struct slice
-    {
-        size32_t start;
-        size32_t n;
-    };
-
-    template<typename T>
-    struct fake_table
-    {
-        T operator[](size_t) const { return val; }
-        T val;
-    };
-}
-
-namespace ftors
-{
-    template<size_t>
-    struct ignore
-    {
-        template<typename T>
-        constexpr ignore(T&&){}
-    };
-
-    template<size_t X, typename = std::make_index_sequence<X - 1>>
-    class element
-    {};
-
-    template<size_t X, size_t... I>
-    class element<X, std::index_sequence<I...>>
-    {
-    public:
-        template<typename First, typename... Rest>
-        constexpr decltype(auto) operator ()(ignore<I>..., First&& arg, Rest&&...) const
-        {
-            return std::forward<First>(arg);
-        }
-    };
-
-    constexpr element<1> _e1;
-    constexpr element<2> _e2;
-    constexpr element<3> _e3;
-    constexpr element<4> _e4;
-    constexpr element<5> _e5;
-    constexpr element<6> _e6;
-    constexpr element<7> _e7;
-    constexpr element<8> _e8;
-    constexpr element<9> _e9;
-
-    template<typename T>
-    class val
-    {
-    public:
-        constexpr val(T&& v):
-            v(std::forward<T>(v))
-        {}
-
-        template<typename... Args>
-        constexpr auto operator ()(Args&&...) const
-        {
-            return v;
-        }
-
-    private:
-        T v;
-    };
-
-    template<typename T>
-    val(T&&) -> val<std::decay_t<T>>;
-
-    template<typename T>
-    class create
-    {
-    public:
-        template<typename... Args>
-        constexpr auto operator ()(Args&&...) const
-        {
-            return T{};
-        }
-    };
-
-    template<typename T, std::size_t FromIdx = 1, typename = std::make_index_sequence<FromIdx - 1>>
-    struct construct
-    {};
-
-    template<
-        typename T,
-        std::size_t FromIdx,
-        std::size_t... Skip
-    >
-    struct construct<
-        T,
-        FromIdx,
-        std::index_sequence<Skip...>>
-    {
-        template<typename Arg, typename... Rest>
-        constexpr auto operator()(ignore<Skip>..., Arg&& arg, Rest&&...) const
-        {
-            return T{std::forward<Arg>(arg)};
-        }
-    };
-
-    template<
-        std::size_t ContIdx = 1,
-        std::size_t ArgIdx = 2,
-        typename = std::make_index_sequence<std::min(ContIdx, ArgIdx) - 1>,
-        typename = std::make_index_sequence<std::max(ContIdx, ArgIdx) - std::min(ContIdx, ArgIdx) - 1>,
-        bool container_first = ContIdx < ArgIdx
-    >
-    struct emplace_back
-    {};
-
-    template<
-        std::size_t ContIdx,
-        std::size_t ArgIdx,
-        std::size_t... Skip1,
-        std::size_t... Skip2
-    >
-    struct emplace_back<
-        ContIdx,
-        ArgIdx,
-        std::index_sequence<Skip1...>,
-        std::index_sequence<Skip2...>,
-        true>
-    {
-        template<typename Container, typename Arg, typename... Rest>
-        constexpr decltype(auto) operator()(ignore<Skip1>..., Container &&container, ignore<Skip2>..., Arg&& arg, Rest&&...) const
-        {
-            container.emplace_back(std::move(arg));
-            return std::move(container);
-        }
-    };
-
-    template<
-        std::size_t ContIdx,
-        std::size_t ArgIdx,
-        std::size_t... Skip1,
-        std::size_t... Skip2
-    >
-    struct emplace_back<
-        ContIdx,
-        ArgIdx,
-        std::index_sequence<Skip1...>,
-        std::index_sequence<Skip2...>,
-        false>
-    {
-        template<typename Container, typename Arg, typename... Rest>
-        constexpr decltype(auto) operator()(ignore<Skip1>..., Arg&& arg, ignore<Skip2>..., Container &&container, Rest&&...) const
-        {
-            container.emplace_back(std::move(arg));
-            return std::move(container);
-        }
-    };
-
-    template<
-        std::size_t ContIdx = 1,
-        std::size_t ArgIdx = 2,
-        typename = std::make_index_sequence<std::min(ContIdx, ArgIdx) - 1>,
-        typename = std::make_index_sequence<std::max(ContIdx, ArgIdx) - std::min(ContIdx, ArgIdx) - 1>,
-        bool container_first = ContIdx < ArgIdx
-    >
-    struct push_back
-    {};
-
-    template<
-        std::size_t ContIdx,
-        std::size_t ArgIdx,
-        std::size_t... Skip1,
-        std::size_t... Skip2
-    >
-    struct push_back<
-        ContIdx,
-        ArgIdx,
-        std::index_sequence<Skip1...>,
-        std::index_sequence<Skip2...>,
-        true>
-    {
-        template<typename Container, typename Arg, typename... Rest>
-        constexpr decltype(auto) operator()(ignore<Skip1>..., Container &&container, ignore<Skip2>..., const Arg& arg, Rest&&...) const
-        {
-            container.push_back(arg);
-            return std::move(container);
-        }
-    };
-
-    template<
-        std::size_t ContIdx,
-        std::size_t ArgIdx,
-        std::size_t... Skip1,
-        std::size_t... Skip2
-    >
-    struct push_back<
-        ContIdx,
-        ArgIdx,
-        std::index_sequence<Skip1...>,
-        std::index_sequence<Skip2...>,
-        false>
-    {
-        template<typename Container, typename Arg, typename... Rest>
-        constexpr decltype(auto) operator()(ignore<Skip1>..., const Arg& arg, ignore<Skip2>..., Container &&container, Rest&&...) const
-        {
-            container.push_back(arg);
-            return std::move(container);
-        }
-    };
-}
-
-namespace buffers
-{
-    template<size_t N>
-    class cstring_buffer
-    {
-    public:
-        template<size_t N1>
-        constexpr cstring_buffer(const char(&source)[N1])
-        {
-            utils::copy_array(data, source, std::make_index_sequence<N1>{});
-        }
-
-        struct iterator
-        {
-            const char* ptr;
-
-            constexpr char operator *() const { return *ptr; }
-            constexpr iterator& operator ++() { ++ptr; return *this; }
-            constexpr iterator operator ++(int) { iterator i(*this); ++ptr; return i; }
-            constexpr bool operator == (const iterator& other) const { return ptr == other.ptr; }
-            constexpr bool operator != (const iterator& other) const { return ptr != other.ptr; }
-            constexpr iterator& operator += (size_t len) { ptr += len; return *this; }
-        };
-
-        constexpr iterator begin() const { return iterator{ data }; }
-        constexpr iterator end() const { return iterator{ data + N - 1 }; }
-        constexpr std::string_view get_view(iterator start, iterator end) const { return std::string_view(start.ptr, end.ptr - start.ptr); }
-
-    private:
-        char data[N] = { 0 };
-    };
-
-    template<size_t N>
-    cstring_buffer(const char(&)[N])->cstring_buffer<N>;
-
-    class string_buffer
-    {
-    public:
-        string_buffer(std::string&& str):
-            str(std::move(str))
-        {}
-
-        string_buffer(const char* str):
-            str(str)
-        {}
-
-        auto begin() const { return str.cbegin(); }
-        auto end() const { return str.cend(); }
-
-        using iterator = std::string::const_iterator;
-
-        std::string_view get_view(iterator start, iterator end) const
-        {
-            return std::string_view(str.data() + (start - str.begin()), end - start);
-        }
-
-    private:
-        std::string str;
-    };
-
-    template<typename Buffer>
-    using iterator_t = typename Buffer::iterator;
-}
-
-template<typename ValueType>
-class nterm
-{
-public:
-    using value_type = ValueType;
-
-    constexpr nterm(const char* name) :
-        name(name)
-    {
-        if (name[0] == 0)
-            throw std::runtime_error("empty name not allowed");
-    }
-
-    constexpr const char* get_name() const { return name; }
-
-    template<typename... Args>
-    constexpr auto operator()(Args&&... args) const;
-
-private:
-    const char* name;
-};
-
-enum class associativity { no_assoc, ltor, rtol };
-
-struct source_point
-{
-    size32_t line = 1;
-    size32_t column = 1;
-    size_t global = 0;
-
-    template<typename Iterator>
-    constexpr void update(Iterator start, Iterator end)
-    {
-        while (!(start == end))
-        {
-            if (*start == '\n')
-            {
-                ++line;
-                column = 1;
-            }
-            else
-                ++column;
-            ++global;
-            ++start;
-        }
-    }
-
-    friend std::ostream& operator << (std::ostream& o, const source_point& sp);
-};
-
-inline std::ostream& operator << (std::ostream& o, const source_point& sp)
-{
-    o << "[" << sp.line << ":" << sp.column << "]";
-    return o;
-}
-
-template<typename VT>
-class term_value
-{
-public:
-    constexpr term_value(VT v, source_point sp):
-        value(v), sp{ sp }
-    {}
-
-    constexpr operator VT() const { return value; }
-    constexpr size32_t get_line() const { return sp.line; }
-    constexpr size32_t get_column() const { return sp.column; }
-    constexpr const VT& get_value() const { return value; }
-    constexpr source_point get_sp() const { return sp; }
-
-private:
-    VT value;
-    source_point sp;
-};
-
-class term
-{
-public:
-    constexpr term(int precedence = 0, associativity a = associativity::no_assoc) :
-        precedence(precedence), ass(a)
-    {}
-
-    constexpr associativity get_associativity() const { return ass; }
-    constexpr int get_precedence() const { return precedence; }
-
-protected:
-    int precedence;
-    associativity ass;
-};
-
-namespace detail
-{
-    constexpr std::string_view pass_sv(const std::string_view& sv) { return sv; }
-    constexpr char first_sv_char(const std::string_view& sv) { return sv[0]; }
-}
-
-class char_term : public term
-{
-public:
-    using internal_value_type = char;
-
-    static const size_t dfa_size = 2;
-    static const bool is_trivial = true;
-
-    constexpr char_term(char c, int precedence = 0, associativity a = associativity::no_assoc):
-        term(precedence, a), c(c)
-    {
-        utils::copy_array(id, utils::c_names.name(c), std::make_index_sequence<utils::char_names::name_size>{});
-    }
-
-    constexpr const char* get_id() const { return id; }
-    constexpr const char* get_name() const { return get_id(); }
-    constexpr char get_char() const { return c; }
-    constexpr char get_data() const { return c; }
-
-    constexpr const auto& get_ftor() const { return detail::first_sv_char; }
-
-private:
-    char c;
-    char id[utils::char_names::name_size] = {};
-};
-
-template<size_t DataSize>
-class string_term : public term
-{
-public:
-    using internal_value_type = std::string_view;
-    static const size_t dfa_size = (DataSize - 1) * 2;
-    static const bool is_trivial = true;
-
-    constexpr string_term(const char (&str)[DataSize], int precedence = 0, associativity a = associativity::no_assoc):
-        term(precedence, a)
-    {
-        utils::copy_array(data, str, std::make_index_sequence<DataSize>{});
-    }
-
-    constexpr const char* get_id() const { return data; }
-    constexpr const char* get_name() const { return get_id(); }
-    constexpr const auto& get_data() const { return data; }
-
-    constexpr const auto& get_ftor() const { return detail::pass_sv; }
-
-private:
-    char data[DataSize] = {};
-};
-
-template<typename Term, typename Ftor>
-class typed_term
-{
-public:
-    using internal_value_type = std::invoke_result_t<Ftor, std::string_view>;
-    static const size_t dfa_size = Term::dfa_size;
-    static const bool is_trivial = Term::is_trivial;
-
-    constexpr typed_term(Term t, Ftor f):
-        term(t), ftor(f)
-    {}
-
-    constexpr const char* get_id() const { return term.get_id(); }
-    constexpr const char* get_name() const { return term.get_name(); }
-    constexpr decltype(auto) get_data() const { return term.get_data(); }
-
-    constexpr associativity get_associativity() const { return term.get_associativity(); }
-    constexpr int get_precedence() const { return term.get_precedence(); }
-
-    using ftor_type = Ftor;
-
-    constexpr const ftor_type& get_ftor() const { return ftor; }
-
-private:
-    Term term;
-    ftor_type ftor;
-};
-
-template<typename Ftor>
-class custom_term : public term
-{
-public:
-    using internal_value_type = std::invoke_result_t<Ftor, std::string_view>;
-    static const size_t dfa_size = 0;
-    static const bool is_trivial = false;
-
-    constexpr custom_term(const char* custom_name, Ftor ftor, int precedence = 0, associativity a = associativity::no_assoc):
-        term(precedence, a), custom_name(custom_name), ftor(ftor)
-    {}
-
-    constexpr const char* get_id() const { return get_name(); }
-    constexpr const char* get_name() const { return custom_name; }
-
-    using ftor_type = Ftor;
-
-    constexpr const ftor_type& get_ftor() const { return ftor; }
-
-private:
-    const char* custom_name;
-    Ftor ftor;
-};
-
-struct error_recovery_token
-{
-    constexpr static const char* get_name() { return "<error_recovery_token>"; }
-    constexpr static const char* get_id() { return get_name(); }
-};
-
-constexpr error_recovery_token error;
-
-template<typename T, typename Enable = void>
-struct value_type
-{};
-
-template<typename T>
-struct value_type<T, std::enable_if_t<std::is_base_of_v<term, T>>>
-{
-    using type = term_value<typename T::internal_value_type>;
-};
-
-template<typename ValueType>
-struct value_type<nterm<ValueType>>
-{
-    using type = ValueType;
-};
-
-template<typename Term, typename Ftor>
-struct value_type<typed_term<Term, Ftor>>
-{
-    using type = term_value<typename typed_term<Term, Ftor>::internal_value_type>;
-};
-
-struct no_type {};
-
-template<>
-struct value_type<error_recovery_token>
-{
-    using type = no_type;
-};
-
-template<typename T>
-using value_type_t = typename value_type<T>::type;
-
-struct parse_options
-{
-    constexpr parse_options& set_verbose(bool val = true) { verbose = val; return *this; }
-    constexpr parse_options& set_skip_whitespace(bool val = true) { skip_whitespace = val; return *this; }
-    constexpr parse_options& set_skip_newline(bool val = true) { skip_newline = val; return *this; }
-
-    bool verbose = false;
-    bool skip_whitespace = true;
-    bool skip_newline = true;
-};
-
-struct match_options
-{
-    bool verbose = false;
-    constexpr match_options& set_verbose(bool val = true) { verbose = val; return *this; }
-};
-
-namespace detail
-{
-    struct no_stream
-    {
-        template<typename T>
-        constexpr const no_stream& operator <<(T&&) const { return *this; }
-    };
-}
-
-template<typename Iterator>
-struct recognized_term
-{
-    Iterator it;
-    size16_t term_idx;
-};
-
-namespace regex
-{
-    using conflicted_terms = size16_t[4];
-
-    constexpr void add_conflicted_term(conflicted_terms& ts, size16_t t)
-    {
-        for (size_t i = 0; i < 4; ++i)
-            if (ts[i] == uninitialized16)
-            {
-                ts[i] = t;
-                break;
-            }
-    }
-
-    struct dfa_state
-    {
-        constexpr dfa_state()
-        {
-            for (auto& t : transitions)
-                t = uninitialized16;
-        }
-
-        size8_t start_state = 0;
-        size8_t end_state = 0;
-        size8_t unreachable = 0;
-        conflicted_terms conflicted_recognition = { uninitialized16, uninitialized16, uninitialized16, uninitialized16 };
-        static const size_t transitions_size = meta::distinct_values_count<char>;
-        size16_t transitions[transitions_size] = {};
-    };
-
-    struct char_range
-    {
-        constexpr char_range(char c):
-            start(c), end(c)
-        {}
-
-        constexpr char_range(char c1, char c2):
-            start(c1), end(c2)
-        {}
-        char start;
-        char end;
-    };
-
-    constexpr char hex_digits_to_char(char d1, char d2)
-    {
-        auto dd = [](char d) -> char
-        {
-            if (d >= 'A' && d <= 'F')
-                return char(10) + d - 'A';
-            else if (d >= 'a' && d <= 'f')
-                return char(10) + d - 'a';
-            else
-                return d - '0';
-        };
-        return dd(d1) * 16 + dd(d2);
-    }
-
-    class char_subset
-    {
-    public:
-        constexpr char_subset() = default;
-
-        template<size_t N>
-        constexpr char_subset(const char (&str)[N])
-        {
-            for (size_t i = 0; i < N - 1; ++i)  // ignore trailing 0, so N - 1
-                data.set(utils::char_to_idx(str[i]));
-        }
-
-        constexpr char_subset(char_range r)
-        {
-            add_range(r);
-        }
-
-        constexpr char_subset& add_range(char_range r)
-        {
-            for (size_t i = utils::char_to_idx(r.start); i <= utils::char_to_idx(r.end); ++i)
-                data.set(i);
-            return *this;
-        }
-
-        constexpr bool test(size_t idx) const { return data.test(idx); }
-        constexpr size_t size() const { return data.size(); }
-        constexpr char_subset& set() { data.set(); return *this; }
-        constexpr char_subset& flip() { data.flip(); return *this; }
-        constexpr char_subset& set(size_t idx) { data.set(idx); return *this; }
-
-    private:
-        stdex::cbitset<meta::distinct_values_count<char>> data = {};
-    };
-
-    template<size_t N>
-    using dfa = stdex::cvector<dfa_state, N>;
-
-    class dfa_size_analyzer
-    {
-    public:
-        using slice = utils::slice;
-
-        constexpr slice primary_char(char) { return prim(); }
-        constexpr slice primary_subset(char_subset&&) { return prim(); }
-
-        constexpr slice star(slice s) { return s; }
-        constexpr slice plus(slice s) { return s; }
-        constexpr slice opt(slice s) { return s; }
-        constexpr slice cat(slice s1, slice s2) { return add(s1, s2); }
-        constexpr slice alt(slice s1, slice s2) { return add(s1, s2); }
-
-        constexpr slice rep(slice s, size32_t n)
-        {
-            if (n == 0)
-                return s;
-            size += (s.n * (n - 1));
-            return slice{ s.start, s.n * n };
-        }
-
-    private:
-        constexpr slice prim() { auto old = size; size += 2; return slice{ old, 2 }; }
-        constexpr slice add(slice s1, slice s2) { return slice{ s1.start, s1.n + s2.n }; }
-
-        size32_t size = 0;
-    };
-
-    template<size_t N>
-    class dfa_builder
-    {
-    public:
-        constexpr dfa_builder(dfa<N>& sm):
-            sm(sm)
-        {}
-
-        using slice = utils::slice;
-
-        constexpr dfa_state& transition(dfa_state& from, const char_subset& s)
-        {
-            for (size_t i = 0; i < s.size(); ++i)
-                if (s.test(i))
-                {
-                    from.transitions[i] = size16_t(sm.size());
-                }
-            sm.push_back(dfa_state());
-            return sm.back();
-        }
-
-        constexpr dfa_state& transition(dfa_state& from, char c)
-        {
-            from.transitions[utils::char_to_idx(c)] = size16_t(sm.size());
-            sm.push_back(dfa_state());
-            return sm.back();
-        }
-
-        constexpr slice primary_char(char c)
-        {
-            return primary_subset(char_subset(char_range(c)));
-        }
-
-        constexpr slice primary_subset(const char_subset& s)
-        {
-            size_t old_size = sm.size();
-            sm.push_back(dfa_state());
-            sm.back().start_state = 1;
-            dfa_state& to = transition(sm.back(), s);
-            to.end_state = 1;
-            return slice{ size32_t(old_size), 2 };
-        }
-
-        constexpr slice star(slice s)
-        {
-            size_t b = s.start;
-            sm[b].end_state = 1;
-            for (size_t i = s.start; i < s.start + s.n; ++i)
-            {
-                if (sm[i].end_state)
-                    merge(i, b);
-            }
-            return s;
-        }
-
-        constexpr slice plus(slice s)
-        {
-            size_t b = s.start;
-            for (size_t i = s.start; i < s.start + s.n; ++i)
-            {
-                if (sm[i].end_state)
-                    merge(i, b, true);
-            }
-            return s;
-        }
-
-        constexpr slice opt(slice s)
-        {
-            sm[s.start].end_state = 1;
-            return s;
-        }
-
-        constexpr slice rep(slice s, size32_t n)
-        {
-            if (n == 0)
-            {
-                for (size_t j = s.start; j < s.start + s.n; ++j)
-                {
-                    if (sm[j].start_state)
-                    {
-                        for (auto& t : sm[j].transitions)
-                            t = uninitialized16;
-                        sm[j].end_state = 1;
-                        sm[j].start_state = 0;
-                    }
-                    else
-                        sm[j].unreachable = 1;
-                }
-                return s;
-            }
-
-            for (size_t i = 0; i < n - 1; ++i)
-            {
-                for (size_t j = s.start; j < s.start + s.n; ++j)
-                {
-                    sm.push_back(sm[j]);
-                    auto& st = sm.back();
-                    for (auto& t : st.transitions)
-                    {
-                        if (t != uninitialized16)
-                            t += size16_t(s.n * (i + 1));
-                    }
-                }
-            }
-            slice whole = s;
-            for (size_t i = 0; i < n - 1; ++i)
-            {
-                cat(whole, slice{ whole.start + whole.n, s.n });
-                whole = slice{ whole.start, whole.n + s.n};
-            }
-            return whole;
-        }
-
-        constexpr slice cat(slice s1, slice s2)
-        {
-            size_t b = s2.start;
-            for (size_t i = s1.start; i < s1.start + s1.n; ++i)
-            {
-                if (sm[i].end_state)
-                    merge(i, b, false, true);
-            }
-            return slice{ s1.start, s1.n + s2.n };
-        }
-
-        constexpr slice alt(slice s1, slice s2)
-        {
-            size_t b1 = s1.start;
-            size_t b2 = s2.start;
-            merge(b1, b2, true, true);
-            return slice{ s1.start, s1.n + s2.n };
-        }
-
-        constexpr void mark_end_states(slice s, size16_t idx)
-        {
-            for (size_t i = s.start; i < s.start + s.n; ++i)
-            {
-                mark_end_state(sm[i], idx);
-            }
-        }
-
-        constexpr size_t size() const { return sm.size(); }
-    private:
-        constexpr void merge(size_t to, size_t from, bool keep_end_state = false, bool mark_from_as_unreachable = false)
-        {
-            if (to == from)
-                return;
-            dfa_state& s_from = sm[from];
-            dfa_state& s_to = sm[to];
-            s_from.start_state = 0;
-            if (keep_end_state)
-                s_to.end_state = s_to.end_state || s_from.end_state;
-            else
-                s_to.end_state = s_from.end_state;
-
-            s_from.unreachable = mark_from_as_unreachable ? 1 : 0;
-
-            for (size_t i = 0; i < dfa_state::transitions_size; ++i)
-            {
-                size16_t& tr_from = s_from.transitions[i];
-                if (tr_from == uninitialized16)
-                    continue;
-                size16_t& tr_to = s_to.transitions[i];
-                if (tr_to == uninitialized16)
-                {
-                    tr_to = tr_from;
-                    sm[tr_to].unreachable = 0;
-                }
-                else
-                    merge(tr_to, tr_from, keep_end_state, mark_from_as_unreachable);
-            }
-
-            auto& cr = s_from.conflicted_recognition;
-            for (size_t j = 0; j < 4; ++j)
-            {
-                size16_t term_idx = cr[j];
-                if (term_idx != uninitialized16)
-                    mark_end_state(s_to, term_idx);
-                else
-                    break;
-            }
-        }
-
-        constexpr void mark_end_state(dfa_state& s, size16_t idx)
-        {
-            if (!s.end_state)
-                return;
-            add_conflicted_term(s.conflicted_recognition, idx);
-        }
-
-        dfa<N>& sm;
-    };
-
-    template<size_t N>
-    struct regex_pattern_data
-    {
-        const char (&pattern)[N];
-    };
-
-    template<size_t N, typename Parser>
-    constexpr void add_term_data_to_dfa(char c, dfa_builder<N>& b, const Parser&, size16_t idx)
-    {
-        using slice = utils::slice;
-
-        slice prev{0, size32_t(b.size())};
-        slice new_sl = b.primary_char(c);
-        b.mark_end_states(new_sl, idx);
-        b.alt(prev, new_sl);
-    }
-
-    template<size_t N, typename Parser, size_t DataSize>
-    constexpr void add_term_data_to_dfa(const char (&str)[DataSize], dfa_builder<N>& b, const Parser&, size16_t idx)
-    {
-        using slice = utils::slice;
-        slice prev{0, size32_t(b.size())};
-
-        slice whole = b.primary_char(str[0]);
-        for (size_t i = 1; i < DataSize - 1; ++i)
-        {
-            slice char_sl = b.primary_char(str[i]);
-            whole = b.cat(whole, char_sl);
-        }
-
-        b.mark_end_states(whole, idx);
-        b.alt(prev, whole);
-    }
-
-    template<size_t N, typename Parser, size_t PatternSize>
-    constexpr void add_term_data_to_dfa(
-        const regex_pattern_data<PatternSize>& pattern_data,
-        dfa_builder<N>& b,
-        const Parser& p,
-        size16_t idx)
-    {
-        using slice = utils::slice;
-        detail::no_stream s{};
-        std::optional<slice> res = p.parse(
-            parse_options{}.set_skip_whitespace(false),
-            buffers::cstring_buffer(pattern_data.pattern),
-            s
-        );
-
-        if (res.has_value())
-        {
-            slice prev{0, size32_t(b.size())};
-            b.mark_end_states(res.value(), idx);
-            b.alt(prev, res.value());
-        }
-        else
-            throw std::runtime_error("Regex parse error");
-    }
-
-    template<size_t N, typename Iterator, typename ErrorStream>
-    constexpr auto dfa_match(
-        const dfa<N>& sm,
-        match_options options,
-        source_point sp,
-        Iterator start,
-        Iterator end,
-        ErrorStream& error_stream)
-    {
-        size16_t state_idx = 0;
-        Iterator it_prev = start;
-        recognized_term<Iterator> rt{ start, uninitialized16 };
-        while (true)
-        {
-            const dfa_state& state = sm[state_idx];
-            size16_t rec_idx = state.conflicted_recognition[0];
-            if (rec_idx != uninitialized16)
-            {
-                rt.it = start;
-                rt.term_idx = rec_idx;
-
-                if (options.verbose)
-                {
-                    error_stream << sp << " REGEX MATCH: Recognized " << rec_idx << "\n";
-                }
-            }
-            sp.update(it_prev, start);
-
-            if (start == end)
-                break;
-
-            size16_t tr = state.transitions[utils::char_to_idx(*start)];
-            if (tr == uninitialized16)
-            {
-                if (rt.term_idx == uninitialized16)
-                    rt.it = start;
-                break;
-            }
-
-            state_idx = tr;
-
-            if (options.verbose)
-            {
-                error_stream << sp << " REGEX MATCH: Current char " << utils::c_names.name(*start) << "\n";
-                error_stream << sp << " REGEX MATCH: New state " << state_idx << "\n";
-            }
-            it_prev = start;
-            ++start;
-        }
-        return rt;
-    }
-
-    template<typename Stream, typename StrTable>
-    constexpr void write_dfa_state_diag_str(const dfa_state& st, Stream& s, size16_t idx, const StrTable& term_names)
-    {
-        s << "STATE " << idx;
-        if (st.unreachable)
-        {
-            s << " (unreachable) \n";
-            return;
-        }
-
-        if (st.end_state)
-            s << " recognized ";
-        size16_t term_idx = st.conflicted_recognition[0];
-        if (term_idx != uninitialized16)
-            s << term_names[term_idx];
-        s << "   ";
-
-        auto f_range = [&s](const auto& r, size16_t state_idx)
-        {
-            if (r.size() > 2)
-            {
-                s << "[";
-                s << utils::c_names.name(r.front());
-                s << " - ";
-                s << utils::c_names.name(r.back());
-                s << "] -> " << state_idx << "  ";
-            }
-            else
-            {
-                for (char c : r)
-                {
-                    s << utils::c_names.name(c);
-                    s << " -> " << state_idx << "  ";
-                }
-            }
-        };
-
-        stdex::cvector<char, dfa_state::transitions_size> tmp;
-        size16_t prev = uninitialized16;
-        for (size_t i = 0; i < dfa_state::transitions_size + 1; ++i)
-        {
-            size16_t to = (i == dfa_state::transitions_size ? uninitialized16 : st.transitions[i]);
-            if (to == prev && to != uninitialized16)
-                tmp.push_back(utils::idx_to_char(i));
-            else
-            {
-                if (prev != uninitialized16)
-                {
-                    f_range(tmp, prev);
-                    tmp.clear();
-                }
-                if (to != uninitialized16)
-                    tmp.push_back(utils::idx_to_char(i));
-            }
-            prev = to;
-        }
-        s << "\n";
-    }
-
-    template<size_t N, typename Stream, typename StrTable>
-    constexpr void write_dfa_diag_str(const dfa<N>& sm, Stream& stream, const StrTable& term_names)
-    {
-        for (size16_t i = 0; i < sm.size(); ++i)
-            write_dfa_state_diag_str(sm[i], stream, i, term_names);
-    }
-
-    template<size_t N, typename Stream>
-    constexpr void write_dfa_diag_str(const dfa<N>& sm, Stream& stream)
-    {
-        write_dfa_diag_str(sm, stream, utils::fake_table<const char*>{""});
-    }
-
-    template<typename Builder>
-    constexpr auto create_regex_parser(Builder& b);
-}
-
-namespace detail
-{
-    template<typename Arg>
-    constexpr decltype(auto) make_term(Arg&& arg)
-    {
-        return std::forward<Arg>(arg);
-    }
-
-    constexpr auto make_term(char c)
-    {
-        return char_term(c);
-    }
-
-    template<size_t N>
-    constexpr auto make_term(const char (&str)[N])
-    {
-        return string_term<N>(str);
-    }
-
-    template<typename ValueType>
-    struct fake_root
-    {
-        using value_type = ValueType;
-
-        constexpr auto operator()(const nterm<ValueType>& nt) const;
-
-        constexpr static const char* get_name() { return "##"; };
-    };
-
-    struct eof
-    {
-        constexpr static const char* get_name() { return "<eof>"; }
-    };
-
-    template<bool RequiresContext, typename F, typename L, typename...R>
-    class rule
-    {
-    public:
-        using f_type = F;
-        static const size_t n = sizeof...(R);
-
-        constexpr rule(L l, std::tuple<R...> r) :
-            f(nullptr), l(l), r(r), precedence(0)
-        {}
-
-        template<typename F1>
-        constexpr rule(F1&& f, L l, std::tuple<R...> r) :
-            f(std::move(f)), l(l), r(r), precedence(0)
-        {}
-
-        template<typename F1>
-        constexpr rule(F1&& f, L l, std::tuple<R...> r, int precedence) :
-            f(std::move(f)), l(l), r(r), precedence(precedence)
-        {}
-
-        constexpr auto operator[](int prec)
-        {
-            return rule<RequiresContext, F, L, R...>(std::move(f), l, r, prec);
-        }
-
-        template<typename F1>
-        constexpr auto operator >= (F1&& f)
-        {
-            return rule<false, std::decay_t<F1>, L, R...>(std::move(f), l, r, precedence);
-        }
-
-        template<typename F1>
-        constexpr auto operator >>= (F1&& f)
-        {
-            return rule<true, std::decay_t<F1>, L, R...>(std::move(f), l, r, precedence);
-        }
-
-        constexpr const F& get_f() const { return f; }
-        constexpr const L& get_l() const { return l; }
-        constexpr const auto& get_r() const { return r; }
-        constexpr int get_precedence() const { return precedence; }
-
-    private:
-        F f;
-        L l;
-        std::tuple<R...> r;
-        int precedence;
-    };
-
-    template<typename L, typename... R>
-    rule(L l, std::tuple<R...> r) -> rule<false, std::nullptr_t, L, R...>;
-
-    template<typename Arg>
-    constexpr auto make_rule_item(Arg&& arg)
-    {
-        return make_term(arg);
-    }
-
-    template<typename ValueType>
-    constexpr auto make_rule_item(const nterm<ValueType>& nt)
-    {
-        return nt;
-    }
-
-    template<typename ValueType>
-    constexpr auto fake_root<ValueType>::operator()(const nterm<ValueType>& nt) const
-    {
-        return rule(*this, std::make_tuple(nt));
-    }
-}
-
-template<typename ValueType>
-template<typename... Args>
-constexpr auto nterm<ValueType>::operator()(Args&&... args) const
-{
-    return detail::rule(
-        *this,
-        std::make_tuple(detail::make_rule_item(args)...)
-    );
-}
-
-namespace detail
-{
-    constexpr size_t value_stack_initial_capacity = 1 << 10;
-    constexpr size_t cursor_stack_initial_capacity = 1 << 10;
-
-    template<typename Context, typename ValueVariantType, typename RuleTupleType, size_t RuleCount>
-    struct value_reductors
-    {
-        constexpr value_reductors(const RuleTupleType& rule_tuple): rule_tuple(rule_tuple) {
-            init_reductors(rule_tuple, std::make_index_sequence<std::tuple_size_v<RuleTupleType>>{});
-        }
-
-        constexpr ValueVariantType invoke(Context&& context, size_t i, ValueVariantType* args) const {
-            return reductors[i](std::forward<Context>(context), rule_tuple, args);
-        }
-
-    private:
-        template<size_t... I>
-        constexpr void init_reductors(const RuleTupleType& rule_tuple, std::index_sequence<I...>)
-        {
-            (void(init_nth_reductor<I>(std::get<I>(rule_tuple))), ...);
-        }
-
-        template<size_t Nr, bool RequiresContext, typename F, typename L, typename... R>
-        constexpr void init_nth_reductor(const detail::rule<RequiresContext, F, L, R...>&)
-        {
-            reductors[Nr] = &reduce_value<Nr, RequiresContext, F, value_type_t<L>, value_type_t<R>...>;
-        }
-
-        template<bool RequiresContext, typename F, typename LValueType, typename... RValueType, size_t... I>
-        constexpr static LValueType reduce_value_impl([[maybe_unused]] Context&& ctx, [[maybe_unused]] const F& f, ValueVariantType* start, std::index_sequence<I...>)
-        {
-            if constexpr (std::is_same_v<F, std::nullptr_t>)
-                return LValueType(std::get<RValueType>(std::move(*(start + I)))...);
-            else
-            {
-                if constexpr (RequiresContext)
-                    return LValueType(f(std::forward<Context>(ctx), std::get<RValueType>(std::move(*(start + I)))...));
-                else
-                    return LValueType(f(std::get<RValueType>(std::move(*(start + I)))...));
-            }
-        }
-
-        template<size_t RuleIdx, bool RequiresContext, typename F, typename LValueType, typename... RValueType>
-        constexpr static ValueVariantType reduce_value(Context&& ctx, const RuleTupleType& rules, ValueVariantType* start)
-        {
-            return ValueVariantType(
-                reduce_value_impl<RequiresContext, F, LValueType, RValueType...>(
-                    std::forward<Context>(ctx), std::get<RuleIdx>(rules).get_f(), start, std::index_sequence_for<RValueType...>{})
-            );
-        }
-
-        const RuleTupleType& rule_tuple;
-
-        using value_reductor = ValueVariantType(*)(Context&&, const RuleTupleType&, ValueVariantType*);
-        value_reductor reductors[RuleCount] = {};
-    };
-
-    template<typename CursorStack, typename ValueStack, typename ErrorStream, typename Iterator, typename ValueReductors>
-    struct parse_state
-    {
-        constexpr parse_state(
-            CursorStack& cursor_stack,
-            ValueStack& value_stack,
-            ErrorStream& error_stream,
-            parse_options options,
-            Iterator buffer_begin,
-            Iterator buffer_end,
-            const ValueReductors& reductors):
-            cursor_stack(cursor_stack),
-            value_stack(value_stack),
-            error_stream(error_stream),
-            options(options),
-            current_sp{1, 1},
-            current_it(buffer_begin),
-            current_term_end_it(buffer_begin),
-            buffer_end(buffer_end),
-            reductors(reductors),
-            current_term_idx(uninitialized16),
-            recovery_mode(false),
-            consume_mode(false)
-        {
-            cursor_stack.reserve(cursor_stack_initial_capacity);
-            value_stack.reserve(value_stack_initial_capacity);
-        }
-
-        constexpr void enter_recovery_mode() { recovery_mode = true; }
-        constexpr void leave_recovery_mode() { recovery_mode = false; }
-        constexpr void enter_consume_mode() { consume_mode = true; }
-        constexpr void leave_consume_mode() { consume_mode = false; }
-        constexpr bool in_recovery_mode() const { return recovery_mode; }
-        constexpr bool in_consume_mode() const { return consume_mode; }
-
-        using iterator = Iterator;
-
-        CursorStack& cursor_stack;
-        ValueStack& value_stack;
-        ErrorStream& error_stream;
-        parse_options options;
-        source_point current_sp;
-        iterator current_it;
-        iterator current_term_end_it;
-        iterator buffer_end;
-        const ValueReductors& reductors;
-        size16_t current_term_idx;
-        bool recovery_mode;
-        bool consume_mode;
-    };
-
-    template<typename Buffer, size_t EmptyRulesCount>
-    struct parse_table_cursor_stack_type
-    {
-        using type = std::vector<size16_t>;
-    };
-
-    template<size_t N, size_t EmptyRulesCount>
-    struct parse_table_cursor_stack_type<buffers::cstring_buffer<N>, EmptyRulesCount>
-    {
-        using type = stdex::cvector<size16_t, N + EmptyRulesCount + 1>;
-    };
-
-    template<typename Buffer, size_t EmptyRulesCount>
-    using parse_table_cursor_stack_type_t = typename parse_table_cursor_stack_type<Buffer, EmptyRulesCount>::type;
-
-    template<typename Buffer, size_t EmptyRulesCount, typename ValueVariantType, typename = void>
-    struct parser_value_stack_type
-    {
-        using type = std::vector<ValueVariantType>;
-    };
-
-    template<size_t N, size_t EmptyRulesCount, typename ValueVariantType>
-    struct parser_value_stack_type<
-        buffers::cstring_buffer<N>,
-        EmptyRulesCount,
-        ValueVariantType,
-        std::enable_if_t<!stdex::is_cvector_compatible<ValueVariantType>::value>
-    >
-    {
-        using type = std::vector<ValueVariantType>;
-    };
-
-    template<size_t N, size_t EmptyRulesCount, typename ValueVariantType>
-    struct parser_value_stack_type<
-        buffers::cstring_buffer<N>,
-        EmptyRulesCount,
-        ValueVariantType,
-        std::enable_if_t<stdex::is_cvector_compatible<ValueVariantType>::value>
-    >
-    {
-        using type = stdex::cvector<ValueVariantType, N + EmptyRulesCount + 1>;
-    };
-
-    template<typename Buffer, size_t EmptyRulesCount, typename ValueVariantType>
-    using parser_value_stack_type_t = typename parser_value_stack_type<Buffer, EmptyRulesCount, ValueVariantType>::type;
-}
-
-
-namespace detail
-{
-    struct deduce_max_states
-    {
-        template<size_t TermCount, size_t... RuleSizes>
-        static const size_t value = (0 + ... + (RuleSizes + 1)) * TermCount;
-    };
-}
-
-template<typename Lexer>
-struct use_lexer
-{
-    using type = Lexer;
-};
-
-struct use_generated_lexer
-{
-    using type = no_type;
-};
-
-template<typename Root, typename Terms, typename NTerms, typename Rules, typename LexerUsage>
-class parser
-{};
-
-template<typename RootValueType, typename... Terms, typename... NTerms, typename... Rules, typename LexerUsage>
-class parser<
-    nterm<RootValueType>,
-    std::tuple<Terms...>,
-    std::tuple<NTerms...>,
-    std::tuple<Rules...>,
-    LexerUsage
->
-{
-    using term_tuple_type = std::tuple<Terms...>;
-    using nterm_tuple_type = std::tuple<NTerms...>;
-    using rule_tuple_type = std::tuple<Rules...>;
-    using root_nterm_type = nterm<RootValueType>;
-    using root_value_type = RootValueType;
-
-    static const bool generate_lexer = std::is_same_v<LexerUsage, use_generated_lexer>;
-    using lexer_type = typename LexerUsage::type;
-
-public:
-    constexpr parser(
-        root_nterm_type grammar_root,
-        term_tuple_type terms,
-        nterm_tuple_type nterms,
-        rule_tuple_type&& rules,
-        LexerUsage):
-        parser(grammar_root, terms, nterms, std::move(rules))
-    {}
-
-    constexpr parser(
-        root_nterm_type grammar_root,
-        term_tuple_type terms,
-        nterm_tuple_type nterms,
-        rule_tuple_type&& rules):
-        term_tuple(terms),
-        nterm_tuple(nterms),
-        rule_tuple(std::move(rules))
-    {
-        auto seq_for_terms = std::make_index_sequence<std::tuple_size_v<term_tuple_type>>{};
-        analyze_nterms(std::make_index_sequence<std::tuple_size_v<nterm_tuple_type>>{});
-        analyze_nterm(detail::fake_root<value_type_t<root_nterm_type>>{});
-        analyze_terms(seq_for_terms);
-        analyze_eof();
-        analyze_error_recovery_token();
-        analyze_rules(std::make_index_sequence<std::tuple_size_v<rule_tuple_type>>{}, grammar_root);
-        analyze_states();
-
-        create_lexer(seq_for_terms);
-    }
-
-    template<typename Buffer>
-    constexpr std::optional<root_value_type> parse(const Buffer& buffer) const
-    {
-        detail::no_stream error_stream;
-        return parse(buffer, error_stream);
-    }
-
-    template<typename Context, typename Buffer>
-    constexpr std::optional<root_value_type> context_parse(Context&& ctx, const Buffer& buffer) const
-    {
-        detail::no_stream error_stream;
-        return context_parse(std::forward<Context>(ctx), buffer, error_stream);
-    }
-
-    template<typename Buffer, typename ErrorStream>
-    constexpr std::optional<root_value_type> parse(const Buffer& buffer, ErrorStream& error_stream) const
-    {
-        return parse(parse_options{}, buffer, error_stream);
-    }
-
-    template<typename Context, typename Buffer, typename ErrorStream>
-    constexpr std::optional<root_value_type> context_parse(Context&& ctx, const Buffer& buffer, ErrorStream& error_stream) const
-    {
-        return context_parse(std::forward<Context>(ctx), parse_options{}, buffer, error_stream);
-    }
-
-    template<typename Buffer, typename ErrorStream>
-    constexpr std::optional<root_value_type> parse(parse_options options, const Buffer& buffer, ErrorStream& error_stream) const
-    {
-        return context_parse(no_type{}, options, buffer, error_stream);
-    }
-
-    template<typename Context, typename Buffer, typename ErrorStream>
-    constexpr std::optional<root_value_type> context_parse(Context&& ctx, parse_options options, const Buffer& buffer, ErrorStream& error_stream) const
-    {
-        detail::parser_value_stack_type_t<Buffer, empty_rules_count, value_variant_type> value_stack{};
-        detail::parse_table_cursor_stack_type_t<Buffer, empty_rules_count> cursor_stack{};
-
-        detail::value_reductors<Context, value_variant_type, rule_tuple_type, rule_count> reductors(rule_tuple);
-        detail::parse_state ps(cursor_stack, value_stack, error_stream, options, buffer.begin(), buffer.end(), reductors);
-
-        ps.cursor_stack.push_back(0);
-
-        std::optional<root_value_type> root_value;
-
-        while (true)
-        {
-            size16_t cursor = ps.cursor_stack.back();
-
-            auto t_idx = get_current_term(ps);
-            if (t_idx == uninitialized16)
-                break;
-
-            const auto& entry = parse_table[cursor][get_parse_table_idx(true, t_idx)];
-
-            if (entry.kind == parse_table_entry_kind::error)
-            {
-                if (ps.in_consume_mode())
-                {
-                    if (!consume_term_recovering(ps))
-                        break;
-                    continue;
-                }
-                if (!ps.in_recovery_mode())
-                {
-                    syntax_error(ps);
-                    enter_recovery_mode(ps);
-                }
-                if (!pop_stacks(ps))
-                    break;
-                continue;
-            }
-            else
-            {
-                if (ps.in_consume_mode())
-                    leave_consume_mode(ps);
-            }
-
-            if (entry.kind == parse_table_entry_kind::shift)
-            {
-                shift(ps, buffer.get_view(ps.current_it, ps.current_term_end_it), t_idx, entry.shift);
-                consume_term(ps);
-            }
-            else if (entry.kind == parse_table_entry_kind::shift_error_recovery_token)
-            {
-                shift_recovery_token(ps, entry.shift);
-                leave_recovery_mode(ps);
-                enter_consume_mode(ps);
-            }
-            else if (entry.kind == parse_table_entry_kind::reduce)
-                reduce(std::forward<Context>(ctx), ps, entry.reduce);
-            else if (entry.kind == parse_table_entry_kind::rr_conflict)
-                rr_conflict(std::forward<Context>(ctx), ps, entry.reduce);
-            else if (entry.kind == parse_table_entry_kind::success)
-            {
-                root_value = std::optional(std::move(success(ps)));
-                break;
-            }
-        }
-
-        return root_value;
-    }
-
-    template<typename Stream>
-    constexpr void write_diag_str(Stream& s) const
-    {
-        s << "PARSER" << "\n" << "\n";
-
-        s << "Parser Object size: " << sizeof(*this) << "\n\nRULES\n\n";
-
-        for (size16_t i = 0; i < rule_count; ++i)
-        {
-            s << i << "    ";
-            write_rule_diag_str(s, i);
-            s << "\n";
-        }
-
-        s << "\nSTATES\n\n";
-        for (size16_t i = 0; i < state_count; ++i)
-        {
-            write_state_diag_str(s, i);
-            s << "\n";
-        }
-
-        if constexpr (generate_lexer)
-        {
-            s << "\n" << "LEXICAL ANALYZER" << "\n" << "\n";
-            regex::write_dfa_diag_str(lexer_sm, s, term_names);
-        }
-    }
-
-private:
-    static const size_t max_rule_element_count = meta::max_v<1, Rules::n...>;
-    static const size16_t eof_idx = sizeof...(Terms);
-    static const size16_t error_recovery_token_idx = sizeof...(Terms) + 1;
-    static const size_t term_count = sizeof...(Terms) + 2;
-    static const size16_t fake_root_idx = sizeof...(NTerms);
-    static const size_t nterm_count = sizeof...(NTerms) + 1;
-    static const size_t root_rule_idx = sizeof...(Rules);
-    static const size_t rule_count = sizeof...(Rules) + 1;
-    static const size_t empty_rules_count = meta::count_zeros<Rules::n...>;
-    static const size_t situation_size = max_rule_element_count + 1;
-    static const size_t situation_address_space_size = rule_count * situation_size * term_count;
-    static const size_t max_states = detail::deduce_max_states::template value<term_count, Rules::n..., 1>;
-    static const size_t lexer_dfa_size = generate_lexer ? (0 + ... + Terms::dfa_size) : 1;
-
-    using value_variant_type = meta::unique_types_variant_t<
-        std::nullptr_t,
-        no_type,
-        value_type_t<NTerms>...,
-        value_type_t<Terms>...
-    >;
-
-    using term_subset = stdex::cbitset<term_count>;
-    using nterm_subset = stdex::cbitset<nterm_count>;
-    using right_side_slice_subset = stdex::cbitset<situation_size * rule_count>;
-    using state = stdex::cbitset<situation_address_space_size>;
-    using situation_set = stdex::cbitset<situation_address_space_size>;
-
-    struct situation_queue_entry
-    {
-        size16_t state_idx;
-        size32_t idx;
-    };
-
-    using situation_queue_t = stdex::cqueue<
-        situation_queue_entry,
-        max_states * max_states
-    >;
-
-    struct symbol
-    {
-        constexpr symbol() :
-            term(false), idx(uninitialized16)
-        {}
-
-        constexpr symbol(bool term, size16_t idx) :
-            term(term), idx(idx)
-        {}
-
-        constexpr size16_t get_parse_table_idx() const
-        {
-            return parser::get_parse_table_idx(term, idx);
-        }
-
-        bool term;
-        size16_t idx;
-    };
-
-    struct situation_info
-    {
-        size16_t rule_info_idx;
-        size16_t after;
-        size16_t t;
-    };
-
-    struct rule_info
-    {
-        size16_t l_idx;
-        size16_t r_idx;
-        size16_t r_elements;
-    };
-
-    enum class parse_table_entry_kind : size16_t { error, success, shift, shift_error_recovery_token, reduce, rr_conflict };
-
-    constexpr static bool is_shift(parse_table_entry_kind kind)
-    {
-        return kind == parse_table_entry_kind::shift || kind == parse_table_entry_kind::shift_error_recovery_token;
-    }
-
-    struct parse_table_entry
-    {
-        parse_table_entry_kind kind = parse_table_entry_kind::error;
-        size16_t shift = uninitialized16;
-        size16_t reduce = uninitialized16;
-
-        bool has_shift = false;
-        bool has_reduce = false;
-
-        constexpr void set_shift(size16_t value) { shift = value; has_shift = true; }
-        constexpr void set_reduce(size16_t value) { reduce = value; has_reduce = true; }
-    };
-
-    constexpr static size16_t get_parse_table_idx(bool term, size16_t idx)
-    {
-        return term ? nterm_count + idx : idx;
-    }
-
-    constexpr void analyze_eof()
-    {
-        term_names[eof_idx] = detail::eof::get_name();
-        term_ids[eof_idx] = detail::eof::get_name();
-        term_precedences[eof_idx] = 0;
-        term_associativities[eof_idx] = associativity::no_assoc;
-    }
-
-    constexpr void analyze_error_recovery_token()
-    {
-        term_names[error_recovery_token_idx] = error_recovery_token::get_name();
-        term_ids[error_recovery_token_idx] = error_recovery_token::get_name();
-        term_precedences[error_recovery_token_idx] = 0;
-        term_associativities[error_recovery_token_idx] = associativity::no_assoc;
-    }
-
-    template<size16_t TermIdx, typename Term>
-    constexpr void analyze_term(const Term& t)
-    {
-        term_precedences[TermIdx] = t.get_precedence();
-        term_associativities[TermIdx] = t.get_associativity();
-        term_names[TermIdx] = t.get_name();
-        term_ids[TermIdx] = t.get_id();
-        term_ftors[TermIdx] = string_view_to_term_value<TermIdx>;
-    }
-
-    template<typename ValueType>
-    constexpr void analyze_nterm(const nterm<ValueType>& nt, size16_t idx)
-    {
-        nterm_names[idx] = nt.get_name();
-    }
-
-    template<typename ValueType>
-    constexpr void analyze_nterm(detail::fake_root<ValueType>)
-    {
-        nterm_names[fake_root_idx] = detail::fake_root<ValueType>::get_name();
-    }
-
-    template<typename Term>
-    constexpr auto make_symbol(const Term& t) const
-    {
-        return symbol{ true, size16_t(utils::find_str(term_ids, t.get_id())) };
-    }
-
-    template<typename ValueType>
-    constexpr auto make_symbol(const nterm<ValueType>& nt) const
-    {
-        return symbol{ false, size16_t(utils::find_str(nterm_names, nt.get_name())) };
-    }
-
-    template<size_t... I>
-    constexpr void analyze_terms(std::index_sequence<I...>)
-    {
-        (void(analyze_term<I>(std::get<I>(term_tuple))), ...);
-    }
-
-    template<size_t... I>
-    constexpr void analyze_nterms(std::index_sequence<I...>)
-    {
-        (void(analyze_nterm(std::get<I>(nterm_tuple), I)), ...);
-    }
-
-    template<size_t... I>
-    constexpr void analyze_rules(std::index_sequence<I...>, const root_nterm_type& root)
-    {
-        (void(analyze_rule<I>(std::get<I>(rule_tuple), std::make_index_sequence<Rules::n>{})), ...);
-        analyze_rule<root_rule_idx>(detail::fake_root<value_type_t<root_nterm_type>>{}(root), std::index_sequence<0>{});
-        stdex::sort(rule_infos, [](const auto& ri1, const auto& ri2) { return ri1.l_idx < ri2.l_idx; });
-        make_nterm_rule_slices();
-    }
-
-    constexpr void make_nterm_rule_slices()
-    {
-        size16_t nt = 0;
-        for (size16_t i = 0u; i < rule_count; ++i)
-        {
-            if (nt != rule_infos[i].l_idx)
-            {
-                nt = rule_infos[i].l_idx;
-                nterm_rule_slices[nt].start = i;
-                nterm_rule_slices[nt].n = 1;
-            }
-            else
-                nterm_rule_slices[nt].n++;
-        }
-    }
-
-    constexpr size16_t calculate_rule_last_term(size16_t rule_idx, size16_t rule_size) const
-    {
-        for (int i = int(rule_size - 1); i >= 0; --i)
-        {
-            const auto& s = right_sides[rule_idx][i];
-            if (!s.term)
-                continue;
-            return s.idx;
-        }
-        return uninitialized16;
-    }
-
-    constexpr int calculate_rule_precedence(int precedence, size16_t rule_idx) const
-    {
-        if (precedence != 0)
-            return precedence;
-        size16_t last_term_idx = rule_last_terms[rule_idx];
-        if (last_term_idx != uninitialized16)
-            return term_precedences[last_term_idx];
-        return 0;
-    }
-
-    constexpr associativity calculate_rule_associativity(size16_t rule_idx) const
-    {
-        size16_t last_term_idx = rule_last_terms[rule_idx];
-        if (last_term_idx != uninitialized16)
-            return term_associativities[last_term_idx];
-        return associativity::no_assoc;
-    }
-
-    template<size_t Nr, bool RequiresContext, typename F, typename L, typename... R, size_t... I>
-    constexpr void analyze_rule(const detail::rule<RequiresContext, F, L, R...>& r, std::index_sequence<I...>)
-    {
-        size16_t l_idx = size16_t(utils::find_str(nterm_names, r.get_l().get_name()));
-        (void(right_sides[Nr][I] = make_symbol(std::get<I>(r.get_r()))), ...);
-        constexpr size16_t rule_elements_count = size16_t(sizeof...(R));
-        rule_infos[Nr] = { l_idx, size16_t(Nr), rule_elements_count };
-        rule_last_terms[Nr] = calculate_rule_last_term(Nr, rule_elements_count);
-        rule_precedences[Nr] = calculate_rule_precedence(r.get_precedence(), Nr);
-        rule_associativities[Nr] = calculate_rule_associativity(Nr);
-    }
-
-    struct state_analyze_info
-    {
-        situation_queue_t situation_queue = { };
-        stdex::cvector<size32_t, situation_address_space_size> closures[situation_address_space_size] = {};
-        stdex::cbitset<situation_address_space_size> done_closures = {};
-        term_subset situation_first_after[situation_address_space_size] = { };
-        situation_set situation_first_after_analyzed = {};
-        term_subset right_side_slice_first[situation_size * rule_count] = {};
-        right_side_slice_subset right_side_slice_first_analyzed = {};
-        nterm_subset nterm_empty = { };
-        term_subset nterm_first[nterm_count] = { };
-        nterm_subset nterm_empty_analyzed = { };
-        nterm_subset nterm_first_analyzed = { };
-    };
-
-    constexpr size32_t make_situation_idx(situation_info a) const
-    {
-        return a.rule_info_idx * situation_size * term_count + a.after * term_count + a.t;
-    }
-
-    constexpr situation_info make_situation_info(size32_t idx) const
-    {
-        size16_t t = size16_t(idx % term_count);
-        idx /= term_count;
-        size16_t after = size16_t(idx % situation_size);
-        size16_t rule_info_idx = size16_t(idx / situation_size);
-        return situation_info{ rule_info_idx, after, t };
-    }
-
-    constexpr void add_term_subset(term_subset& dest, const term_subset& source)
-    {
-        for (size_t i = 0u; i < term_count; ++i)
-            dest.set(i, dest.test(i) || source.test(i));
-    }
-
-    constexpr const term_subset& make_right_side_slice_first(const rule_info& ri, size_t start, state_analyze_info& sai)
-    {
-        size_t right_side_slice_idx = max_rule_element_count * ri.r_idx + start;
-        auto& res = sai.right_side_slice_first[right_side_slice_idx];
-
-        if (sai.right_side_slice_first_analyzed.test(right_side_slice_idx))
-            return res;
-        sai.right_side_slice_first_analyzed.set(right_side_slice_idx);
-
-        for (size_t i = start; i < ri.r_elements; ++i)
-        {
-            const symbol& s = right_sides[ri.r_idx][i];
-            if (s.term)
-            {
-                res.set(s.idx);
-                break;
-            }
-            add_term_subset(res, make_nterm_first(s.idx, sai));
-            if (!make_nterm_empty(s.idx, sai))
-                break;
-        }
-        return res;
-    }
-
-    constexpr const term_subset& make_nterm_first(size16_t nt, state_analyze_info& sai)
-    {
-        if (sai.nterm_first_analyzed.test(nt))
-            return sai.nterm_first[nt];
-        sai.nterm_first_analyzed.set(nt);
-
-        const utils::slice& s = nterm_rule_slices[nt];
-        for (size_t i = 0u; i < s.n; ++i)
-        {
-            const rule_info& ri = rule_infos[s.start + i];
-            add_term_subset(sai.nterm_first[nt], make_right_side_slice_first(ri, 0, sai));
-        }
-        return sai.nterm_first[nt];
-    }
-
-    constexpr bool is_right_side_slice_empty(const rule_info& ri, size_t start, state_analyze_info& sai)
-    {
-        for (size_t i = start; i < ri.r_elements; ++i)
-        {
-            const symbol& s = right_sides[ri.r_idx][i];
-            if (s.term)
-                return false;
-            if (!make_nterm_empty(s.idx, sai))
-                return false;
-        }
-        return true;
-    }
-
-    constexpr bool is_right_side_empty(const rule_info& ri, state_analyze_info& sai)
-    {
-        return is_right_side_slice_empty(ri, 0, sai);
-    }
-
-    constexpr bool make_nterm_empty(size16_t nt, state_analyze_info& sai)
-    {
-        if (sai.nterm_empty_analyzed.test(nt))
-            return sai.nterm_empty.test(nt);
-        sai.nterm_empty_analyzed.set(nt);
-
-        const utils::slice& s = nterm_rule_slices[nt];
-        for (size_t i = 0u; i < s.n; ++i)
-        {
-            if (is_right_side_empty(rule_infos[s.start + i], sai))
-            {
-                return (sai.nterm_empty.set(nt), true);
-            }
-        }
-        return (sai.nterm_empty.reset(nt), false);
-    }
-
-    constexpr const term_subset& make_situation_first_after(const situation_info& addr, size32_t idx, state_analyze_info& sai)
-    {
-        if (sai.situation_first_after_analyzed.test(idx))
-            return sai.situation_first_after[idx];
-        sai.situation_first_after_analyzed.set(idx);
-
-        const rule_info& ri = rule_infos[addr.rule_info_idx];
-        add_term_subset(sai.situation_first_after[idx], make_right_side_slice_first(ri, addr.after + 1, sai));
-        if (is_right_side_slice_empty(ri, addr.after + 1, sai))
-            sai.situation_first_after[idx].set(addr.t);
-        return sai.situation_first_after[idx];
-    }
-
-    constexpr void analyze_states()
-    {
-        situation_info root_situation_info{ root_rule_idx, 0, eof_idx };
-        size32_t idx = make_situation_idx(root_situation_info);
-        state_count = 1;
-
-        state_analyze_info sai;
-
-        add_situation_to_state(0, idx, sai);
-
-        while (!sai.situation_queue.empty())
-        {
-            const auto& entry = sai.situation_queue.top();
-            sai.situation_queue.pop();
-
-            situation_closure(entry.state_idx, entry.idx, sai);
-            situation_transition(entry.state_idx, entry.idx, sai);
-        }
-    }
-
-    constexpr void add_situation_to_state(size16_t state_idx, size32_t idx, state_analyze_info& sai)
-    {
-        state& s = states[state_idx];
-        if (!s.test(idx))
-        {
-            s.set(idx);
-            sai.situation_queue.push({ state_idx, idx });
-        }
-    }
-
-    constexpr void situation_closure(size16_t state_idx, size32_t idx, state_analyze_info& sai)
-    {
-        if (sai.done_closures.test(idx))
-        {
-            for(auto i = 0u; i < sai.closures[idx].size(); ++i)
-            {
-                add_situation_to_state(state_idx, sai.closures[idx][i], sai);
-            }
-            return;
-        }
-
-        sai.done_closures.set(idx);
-
-        situation_info addr = make_situation_info(idx);
-        const rule_info& ri = rule_infos[addr.rule_info_idx];
-        if (addr.after >= ri.r_elements)
-            return;
-
-        const symbol& s = right_sides[ri.r_idx][addr.after];
-        if (!s.term)
-        {
-            size16_t nt = s.idx;
-            const term_subset& first = make_situation_first_after(addr, idx, sai);
-            const utils::slice& sl = nterm_rule_slices[nt];
-            for (auto i = 0u; i < sl.n; ++i)
-            {
-                for (size16_t t = 0; t < term_count; ++t)
-                {
-                    if (first.test(t))
-                    {
-                        size32_t new_s_idx = make_situation_idx(situation_info{ size16_t(sl.start + i), 0, t });
-                        add_situation_to_state(state_idx, new_s_idx, sai);
-                        sai.closures[idx].push_back(new_s_idx);
-                    }
-                }
-            }
-        }
-    }
-
-    constexpr auto solve_conflict(size16_t rule_info_idx, size16_t term_idx) const
-    {
-        size16_t rule_idx = rule_infos[rule_info_idx].r_idx;
-        int r_p = rule_precedences[rule_idx];
-        int t_p = term_precedences[term_idx];
-        if (r_p > t_p)
-            return parse_table_entry_kind::reduce;
-
-        if (r_p == t_p)
-        {
-            if (rule_associativities[rule_idx] == associativity::ltor)
-                return parse_table_entry_kind::reduce;
-        }
-        return parse_table_entry_kind::shift;
-    }
-
-    constexpr void situation_transition(size16_t state_idx, size32_t idx, state_analyze_info& sai)
-    {
-        situation_info addr = make_situation_info(idx);
-        const rule_info& ri = rule_infos[addr.rule_info_idx];
-        bool reduction = addr.after >= ri.r_elements;
-
-        const auto& s = right_sides[ri.r_idx][addr.after];
-        size16_t symbol_idx = reduction ? get_parse_table_idx(true, addr.t) : s.get_parse_table_idx();
-        auto& entry = parse_table[state_idx][symbol_idx];
-        if (reduction)
-        {
-            if (ri.r_idx == root_rule_idx)
-            {
-                entry.kind = parse_table_entry_kind::success;
-            }
-            else if (entry.has_shift)
-            {
-                entry.kind = solve_conflict(addr.rule_info_idx, addr.t);
-            }
-            else if (entry.has_reduce)
-            {
-                entry.kind = parse_table_entry_kind::rr_conflict;
-            }
-            else
-            {
-                entry.kind = parse_table_entry_kind::reduce;
-            }
-            entry.set_reduce(size16_t(addr.rule_info_idx));
-            return;
-        }
-
-        situation_info new_addr = situation_info{ addr.rule_info_idx, size16_t(addr.after + 1), addr.t };
-        size32_t new_idx = make_situation_idx(new_addr);
-
-        if (entry.has_shift)
-        {
-            add_situation_to_state(entry.shift, new_idx, sai);
-            return;
-        }
-
-        size16_t new_state_idx = uninitialized16;
-        for (size16_t i = 0; i < state_count; ++i)
-        {
-            if (states[i].test(new_idx))
-            {
-                new_state_idx = i;
-                break;
-            }
-        }
-        if (new_state_idx == uninitialized16)
-        {
-            new_state_idx = state_count;
-            ++state_count;
-        }
-
-        if (entry.has_reduce)
-        {
-            entry.kind = solve_conflict(entry.reduce, s.idx);
-        }
-        else
-        {
-            entry.kind = parse_table_entry_kind::shift;
-        };
-        entry.set_shift(new_state_idx);
-
-        if (entry.kind == parse_table_entry_kind::shift && s.idx == error_recovery_token_idx)
-            entry.kind = parse_table_entry_kind::shift_error_recovery_token;
-
-        add_situation_to_state(new_state_idx, new_idx, sai);
-    }
-
-    constexpr const char* get_symbol_name(const symbol& s) const
-    {
-        return s.term ? term_names[s.idx] : nterm_names[s.idx];
-    }
-
-    template<typename Stream>
-    constexpr void write_rule_diag_str(Stream& s, size16_t rule_info_idx) const
-    {
-        const rule_info& ri = rule_infos[rule_info_idx];
-        s << nterm_names[ri.l_idx] << " <- ";
-        if (ri.r_elements > 0)
-            s << get_symbol_name(right_sides[ri.r_idx][0]);
-        for (size_t i = 1u; i < ri.r_elements; ++i)
-        {
-            s << " " << get_symbol_name(right_sides[ri.r_idx][i]);
-        }
-    }
-
-    template<typename Stream>
-    constexpr void write_situation_diag_str(Stream& s, size32_t idx) const
-    {
-        const situation_info addr = make_situation_info(idx);
-        const rule_info& ri = rule_infos[addr.rule_info_idx];
-        s << nterm_names[ri.l_idx] << " <- ";
-        for (size_t i = 0u; i < addr.after; ++i)
-        {
-            s << get_symbol_name(right_sides[ri.r_idx][i]) << " ";
-        }
-        s << ". ";
-        for (size_t i = addr.after; i < ri.r_elements; ++i)
-        {
-            s << get_symbol_name(right_sides[ri.r_idx][i]) << " ";
-        }
-        s << "==> " << term_names[addr.t];
-    }
-
-    template<typename Stream>
-    constexpr void write_state_diag_str(Stream& s, size16_t idx) const
-    {
-        s << "STATE " << idx << "\n";
-
-        for (size32_t i = 0u; i < situation_address_space_size; ++i)
-        {
-            if (states[idx].test(i))
-            {
-                write_situation_diag_str(s, i);
-                s << "\n";
-            }
-        }
-
-        s << "\n";
-
-        for (size_t i = 0; i < nterm_count; ++i)
-        {
-            const auto& entry = parse_table[idx][i];
-            if (is_shift(entry.kind))
-                s << "On " << nterm_names[i] << " go to " << entry.shift << "\n";
-        }
-        for (size_t i = nterm_count; i < nterm_count + term_count; ++i)
-        {
-            const auto& entry = parse_table[idx][i];
-            if (entry.kind == parse_table_entry_kind::error)
-                continue;
-
-            size_t term_idx = i - nterm_count;
-            s << "On " << term_names[term_idx];
-            if (entry.kind == parse_table_entry_kind::success)
-                s << " success \n";
-            else if (entry.kind == parse_table_entry_kind::reduce && entry.has_shift)
-                s << " shift to " << entry.shift << " S/R CONFLICT, prefer reduce(" << rule_infos[entry.reduce].r_idx << ") over shift\n";
-            else if (is_shift(entry.kind) && entry.has_reduce)
-                s << " shift to " << entry.shift << " S/R CONFLICT, prefer shift over reduce(" << rule_infos[entry.reduce].r_idx << ")\n";
-            else if (is_shift(entry.kind))
-                s << " shift to " << entry.shift << "\n";
-            else if (entry.kind == parse_table_entry_kind::reduce)
-                s << " reduce using (" << rule_infos[entry.reduce].r_idx << ")\n";
-            else if (entry.kind == parse_table_entry_kind::rr_conflict)
-                s << " R/R CONFLICT - !!! FIX IT !!! \n";
-        }
-    }
-
-    template<size16_t TermIdx>
-    constexpr static value_variant_type string_view_to_term_value(const term_tuple_type& term_tuple, const std::string_view& sv, source_point sp)
-    {
-        const auto &t = std::get<TermIdx>(term_tuple);
-        using term_value_type = value_type_t<std::tuple_element_t<TermIdx, term_tuple_type>>;
-        return value_variant_type(term_value_type(t.get_ftor()(sv), sp));
-    }
-
-    template<typename ParseState>
-    constexpr void shift_recovery_token(ParseState& ps, size16_t new_cursor_value) const
-    {
-        if (ps.options.verbose)
-            ps.error_stream << ps.current_sp << " PARSE: Shift to " << new_cursor_value << ", term: " << term_names[error_recovery_token_idx] << "\n";
-        ps.cursor_stack.push_back(new_cursor_value);
-
-        ps.value_stack.emplace_back(term_value(no_type{}, ps.current_sp));
-    }
-
-    template<typename ParseState>
-    constexpr void shift(ParseState& ps, const std::string_view& sv, size16_t term_idx, size16_t new_cursor_value) const
-    {
-        if (ps.options.verbose)
-            ps.error_stream << ps.current_sp << " PARSE: Shift to " << new_cursor_value << ", term: " << sv << "\n";
-        ps.cursor_stack.push_back(new_cursor_value);
-
-        const auto& ftor = term_ftors[term_idx];
-        ps.value_stack.emplace_back(ftor(term_tuple, sv, ps.current_sp));
-    }
-
-    template<typename Context, typename ParseState>
-    constexpr void reduce(Context&& ctx, ParseState& ps, size16_t rule_info_idx) const
-    {
-        const auto& ri = rule_infos[rule_info_idx];
-        if (ps.options.verbose)
-        {
-            ps.error_stream << ps.current_sp << " PARSE: Reduced using rule " << ri.r_idx << "  ";
-            write_rule_diag_str(ps.error_stream, rule_info_idx);
-            ps.error_stream << "\n";
-        }
-
-        ps.cursor_stack.erase(ps.cursor_stack.end() - ri.r_elements, ps.cursor_stack.end());
-        size16_t new_cursor_value = parse_table[ps.cursor_stack.back()][ri.l_idx].shift;
-
-        if (ps.options.verbose)
-        {
-            ps.error_stream << ps.current_sp << " PARSE: Go to " << new_cursor_value << "\n";
-        }
-
-        ps.cursor_stack.push_back(new_cursor_value);
-        value_variant_type* start = ps.value_stack.data() + ps.value_stack.size() - ri.r_elements;
-        value_variant_type lvalue(ps.reductors.invoke(std::forward<Context>(ctx), ri.r_idx, start));
-        ps.value_stack.erase(ps.value_stack.end() - ri.r_elements, ps.value_stack.end());
-        ps.value_stack.emplace_back(std::move(lvalue));
-    }
-
-    template<typename Context, typename ParseState>
-    constexpr void rr_conflict(Context&& ctx, ParseState& ps, size16_t rule_idx) const
-    {
-        if (ps.options.verbose)
-        {
-            ps.error_stream << ps.current_sp << " PARSE: R/R conflict encountered \n";
-        }
-        reduce(std::forward<Context>(ctx), ps, rule_idx);
-    }
-
-    template<typename ParseState>
-    constexpr bool pop_stacks(ParseState& ps) const
-    {
-        ps.cursor_stack.pop_back();
-        if (ps.value_stack.size() != 0)
-            ps.value_stack.pop_back();
-
-        if (ps.cursor_stack.size() == 0)
-        {
-            if (ps.options.verbose)
-            {
-                ps.error_stream << ps.current_sp << " PARSE: Could not recover from error \n";
-            }
-            return false;
-        }
-
-        if (ps.options.verbose)
-        {
-            ps.error_stream << ps.current_sp << " PARSE: Recovering to state " << ps.cursor_stack.back() << "\n";
-        }
-
-        return true;
-    }
-
-    template<typename ParseState>
-    constexpr void syntax_error(ParseState& ps) const
-    {
-        ps.error_stream << ps.current_sp << " PARSE: Syntax error: " <<
-            "Unexpected '" << term_names[ps.current_term_idx] << "'" << "\n";
-    }
-
-    template<typename ParseState>
-    constexpr root_value_type& success(ParseState& ps) const
-    {
-        if (ps.options.verbose)
-        {
-            ps.error_stream << ps.current_sp << " PARSE: Success \n";
-        }
-        return std::get<root_value_type>(ps.value_stack.front());
-    }
-
-    template<typename ParseState>
-    constexpr void consume_term(ParseState& ps) const
-    {
-        ps.current_sp.update(ps.current_it, ps.current_term_end_it);
-        ps.current_it = ps.current_term_end_it;
-    }
-
-    template<typename ParseState>
-    constexpr void enter_recovery_mode(ParseState& ps) const
-    {
-        if (ps.options.verbose)
-        {
-            ps.error_stream << ps.current_sp << " PARSE: Entering recovery mode \n";
-        }
-        ps.enter_recovery_mode();
-    }
-
-    template<typename ParseState>
-    constexpr void leave_recovery_mode(ParseState& ps) const
-    {
-        if (ps.options.verbose)
-        {
-            ps.error_stream << ps.current_sp << " PARSE: Leaving recovery mode \n";
-        }
-        ps.leave_recovery_mode();
-    }
-
-    template<typename ParseState>
-    constexpr void enter_consume_mode(ParseState& ps) const
-    {
-        if (ps.options.verbose)
-        {
-            ps.error_stream << ps.current_sp << " PARSE: Entering consume mode \n";
-        }
-        ps.enter_consume_mode();
-    }
-
-    template<typename ParseState>
-    constexpr void leave_consume_mode(ParseState& ps) const
-    {
-        if (ps.options.verbose)
-        {
-            ps.error_stream << ps.current_sp << " PARSE: Leaving consume mode \n";
-        }
-        ps.leave_consume_mode();
-    }
-
-    template<typename ParseState>
-    constexpr bool consume_term_recovering(ParseState& ps) const
-    {
-        if (ps.current_term_idx == eof_idx)
-            return false;
-        if (ps.options.verbose)
-        {
-            ps.error_stream << ps.current_sp << " PARSE: Recovery, consuming term " << term_names[ps.current_term_idx] << " \n";
-        }
-        consume_term(ps);
-        return true;
-    }
-
-    template<typename ParseState>
-    constexpr size16_t get_current_term(ParseState& ps) const
-    {
-        if (ps.in_recovery_mode())
-            return error_recovery_token_idx;
-
-        if (ps.current_it != ps.current_term_end_it)
-            return ps.current_term_idx;
-
-        if (ps.options.skip_whitespace)
-        {
-            auto after_ws = skip_whitespace(ps);
-            ps.current_sp.update(ps.current_it, after_ws);
-            ps.current_it = after_ws;
-        }
-
-        using res_type = recognized_term<typename ParseState::iterator>;
-
-        if (ps.current_it == ps.buffer_end)
-        {
-            ps.current_term_idx = eof_idx;
-            trace_recognized_term(ps);
-            return eof_idx;
-        }
-
-        res_type res{};
-        match_options opts;
-        opts.set_verbose(ps.options.verbose);
-
-        if constexpr (generate_lexer)
-        {
-            res = regex::dfa_match(lexer_sm, opts, ps.current_sp, ps.current_it, ps.buffer_end, ps.error_stream);
-        }
-        else
-        {
-            lexer_type custom_lexer;
-            res = custom_lexer.match(opts, ps.current_sp, ps.current_it, ps.buffer_end, ps.error_stream);
-        }
-
-        ps.current_term_end_it = res.it;
-        ps.current_term_idx = res.term_idx;
-
-        if (ps.current_term_idx == uninitialized16)
-        {
-            unexpected_char(ps);
-            return uninitialized16;
-        }
-        else
-        {
-            trace_recognized_term(ps);
-        }
-
-        return ps.current_term_idx;
-    }
-
-    template<typename ParseState>
-    constexpr auto skip_whitespace(ParseState& ps) const
-    {
-        constexpr char space_chars_newline[] = { 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x20, 0x00 };
-        constexpr char space_chars_no_newline[] = { 0x09, 0x0b, 0x0c, 0x0d, 0x20, 0x00 };
-
-        const auto space_chars = ps.options.skip_newline
-                                     ? space_chars_newline
-                                     : space_chars_no_newline;
-
-        auto start = ps.current_it;
-        while (true)
-        {
-            if (start == ps.buffer_end)
-                break;
-            if (utils::find_char(*start, space_chars) == uninitialized)
-                break;
-            ++start;
-        }
-        return start;
-    }
-
-    template<typename ParseState>
-    constexpr void unexpected_char(ParseState& ps) const
-    {
-        ps.error_stream << ps.current_sp << " PARSE: Unexpected character: " << *ps.current_it << "\n";
-    }
-
-    template<typename ParseState>
-    constexpr void trace_recognized_term(ParseState& ps) const
-    {
-        if (ps.options.verbose)
-            ps.error_stream << ps.current_sp << " PARSE: Recognized " << term_names[ps.current_term_idx] << " \n";
-    }
-
-    struct no_parser{};
-
-    template<size_t... I>
-    constexpr void create_lexer(std::index_sequence<I...>)
-    {
-        if constexpr (generate_lexer)
-        {
-            regex::dfa_builder<lexer_dfa_size> b(lexer_sm);
-            constexpr bool trivial_lexer = (true && ... && std::tuple_element_t<I, term_tuple_type>::is_trivial);
-            if constexpr (trivial_lexer)
-                (void(regex::add_term_data_to_dfa(std::get<I>(term_tuple).get_data(), b, no_parser{}, size16_t(I))), ...);
-            else
-            {
-                auto p = regex::create_regex_parser(b);
-                (void(regex::add_term_data_to_dfa(std::get<I>(term_tuple).get_data(), b, p, size16_t(I))), ...);
-            }
-        }
-    }
-
-    str_table<term_count> term_names = { };
-    str_table<term_count> term_ids = { };
-    str_table<nterm_count> nterm_names = { };
-    symbol right_sides[rule_count][max_rule_element_count] = { };
-    rule_info rule_infos[rule_count] = { };
-    utils::slice nterm_rule_slices[nterm_count] = { };
-    state states[max_states] = { };
-    parse_table_entry parse_table[max_states][term_count + nterm_count] = {};
-    size16_t state_count = 0;
-    int term_precedences[term_count] = { };
-    associativity term_associativities[term_count] = { };
-    int rule_precedences[rule_count] = { };
-    associativity rule_associativities[rule_count] = { };
-    size16_t rule_last_terms[rule_count] = { };
-    term_tuple_type term_tuple;
-    nterm_tuple_type nterm_tuple;
-    rule_tuple_type rule_tuple;
-
-    using string_view_to_term_value_t = value_variant_type(*)(const term_tuple_type&, const std::string_view&, source_point);
-    string_view_to_term_value_t term_ftors[term_count] = {};
-
-    using dfa_type = regex::dfa<lexer_dfa_size>;
-    dfa_type lexer_sm = {};
-};
-
-template<typename Root, typename Terms, typename NTerms, typename Rules>
-parser(Root, Terms, NTerms, Rules&&) -> parser<Root, Terms, NTerms, Rules, use_generated_lexer>;
-
-template<typename Root, typename Terms, typename NTerms, typename Rules, typename LexerUsage>
-parser(Root, Terms, NTerms, Rules&&, LexerUsage) -> parser<Root, Terms, NTerms, Rules, LexerUsage>;
-
-template<typename... Terms>
-constexpr auto terms(const Terms&... terms)
-{
-    return std::make_tuple(detail::make_term(terms)...);
-}
-
-template<typename... NTerms>
-constexpr auto nterms(NTerms... nterms)
-{
-    return std::make_tuple(nterms...);
-}
-
-template<typename... Rules>
-constexpr auto rules(Rules&&... rules)
-{
-    return std::make_tuple(std::move(rules)...);
-}
-
-struct skip
-{
-    template<typename T>
-    constexpr skip(T&&) {}
-};
-
-namespace regex
-{
-    class regex_lexer
-    {
-    public:
-        constexpr regex_lexer()
-        {
-            //0              1             2 3 4 5 6 7 8 9
-            //regex_digit_09 regex_primary * + ? | ( ) { }
-
-            specials[utils::char_to_idx('*')] = 2;
-            specials[utils::char_to_idx('+')] = 3;
-            specials[utils::char_to_idx('?')] = 4;
-            specials[utils::char_to_idx('|')] = 5;
-            specials[utils::char_to_idx('(')] = 6;
-            specials[utils::char_to_idx(')')] = 7;
-            specials[utils::char_to_idx('{')] = 8;
-            specials[utils::char_to_idx('}')] = 9;
-        }
-
-        template<typename Iterator, typename ErrorStream>
-        constexpr auto match(
-            match_options options,
-            source_point sp,
-            Iterator start,
-            Iterator end,
-            ErrorStream& error_stream)
-        {
-            if (start == end)
-                return not_recognized(start);
-
-            char c = *start;
-
-            auto res = [&](size16_t idx, size_t len)
-            { return recognized(idx, len, options, sp, start, error_stream); };
-
-            if (specials[utils::char_to_idx(c)] != 0)
-                return res(specials[utils::char_to_idx(c)], 1);
-
-            if (utils::is_dec_digit(c))
-                return res(0, 1);
-
-            size_t len = 0;
-            bool ok = match_primary(start, end, len);
-            if (ok)
-                return res(1, len);
-
-            return not_recognized(start);
-        }
-
-    private:
-        size16_t specials[meta::distinct_chars_count] = {};
-
-        template<typename Iterator>
-        constexpr bool match_primary(Iterator start, Iterator end, size_t& len)
-        {
-            len = 0;
-            bool ok = match_escaped(start, end, len);
-            if (!ok)
-                return false;
-            if (len != 0)
-                return true;
-
-            ok = match_range(start, end, len);
-            if (!ok)
-                return false;
-            if (len != 0)
-                return true;
-
-            ok = utils::is_printable(*start);
-            if (ok)
-                len = 1;
-            return ok;
-        }
-
-        template<typename Iterator>
-        constexpr bool match_range(Iterator start, Iterator end, size_t& len)
-        {
-            char c = *start;
-            if (c == '[')
-            {
-                len = 1;
-                ++start;
-                if (start == end)
-                {
-                    len = 0;
-                    return false;
-                }
-                c = *start;
-                if (c == '^')
-                {
-                    len = 2;
-                    ++start;
-                }
-                if (start == end)
-                {
-                    len = 0;
-                    return false;
-                }
-                while (start != end && *start != ']')
-                {
-                    size_t item_len = 0;
-                    bool ok = match_range_item(start, end, item_len);
-                    if (!ok)
-                    {
-                        len = 0;
-                        return false;
-                    }
-                    len += item_len;
-                    start += item_len;
-                }
-                if (start == end)
-                {
-                    len = 0;
-                    return false;
-                }
-                len++;
-            }
-            return true;
-        }
-
-        template<typename Iterator>
-        constexpr bool match_range_item(Iterator start, Iterator end, size_t& len)
-        {
-            len = 0;
-            bool ok = match_escaped(start, end, len);
-            if (!ok)
-                return false;
-
-            if (len == 0)
-            {
-                ok = utils::is_printable(*start);
-                if (!ok)
-                    return false;
-                len = 1;
-            }
-
-            start += len;
-
-            if (*start == '-')
-            {
-                len++;
-
-                ++start;
-                if (start == end || *start == ']')
-                    return false;
-
-                size_t range_end_len = 0;
-                bool escaped_ok = match_escaped(start, end, range_end_len);
-                if (!escaped_ok)
-                    return false;
-
-                if (range_end_len == 0)
-                {
-                    ok = utils::is_printable(*start);
-                    if (!ok)
-                        return false;
-                    len += 1;
-                }
-                else
-                    len += range_end_len;
-            }
-
-            return ok;
-        }
-
-        template<typename Iterator>
-        constexpr bool match_escaped(Iterator start, Iterator end, size_t& len)
-        {
-            char c = *start;
-
-            if (c == '\\')
-            {
-                ++start;
-                if (start == end)
-                    return false;
-                c = *start;
-                len = 2;
-                if (c == 'x')
-                {
-                    ++start;
-                    if (start == end)
-                        return true;
-                    c = *start;
-                    if (!utils::is_hex_digit(c))
-                        return true;
-                    ++start;
-                    len = 3;
-                    if (start == end)
-                        return true;
-                    c = *start;
-                    if (!utils::is_hex_digit(c))
-                        return true;
-                    len = 4;
-                    return true;
-                }
-                return utils::is_printable(c);
-            }
-            return true;
-        }
-
-        template<typename Iterator, typename ErrorStream>
-        constexpr auto recognized(
-            size16_t idx,
-            size_t len,
-            match_options options,
-            source_point sp,
-            Iterator start,
-            ErrorStream& error_stream)
-        {
-            Iterator term_end = start;
-            if (options.verbose)
-                error_stream << sp << " LEXER MATCH: Recognized " << idx << " \n";
-            term_end += len;
-            sp.update(start, term_end);
-            return recognized_term<Iterator>{term_end, idx};
-        }
-
-        template<typename Iterator>
-        constexpr auto not_recognized(Iterator start) const
-        {
-            return recognized_term<Iterator>{start, uninitialized16};
-        }
-    };
-
-    constexpr char regex_char(std::string_view sv, size_t& len)
-    {
-        if (sv[0] == '\\')
-        {
-            if (sv[1] == 'x')
-            {
-                if (sv.size() == 2 || !utils::is_hex_digit(sv[2]))
-                {
-                    len = 2;
-                    return 0;
-                }
-                else if (sv.size() == 3 || !utils::is_hex_digit(sv[3]))
-                {
-                    len = 3;
-                    return hex_digits_to_char('0', sv[2]);
-                }
-                else
-                {
-                    len = 4;
-                    return hex_digits_to_char(sv[2], sv[3]);
-                }
-            }
-            else
-            {
-                len = 2;
-                return sv[1];
-            }
-        }
-        else
-        {
-            len = 1;
-            return sv[0];
-        }
-    }
-
-    constexpr char_subset string_view_to_subset(std::string_view sv)
-    {
-        char_subset cs;
-
-        if (sv[0] == '.')
-            cs.flip();
-        else if (sv[0] == '[')
-        {
-            bool flip = false;
-            size_t i = 1;
-            if (sv[1] == '^')
-            {
-                i++;
-                flip = true;
-            }
-            while (sv[i] != ']')
-            {
-                size_t len = 0;
-                char c1 = regex_char(sv.substr(i), len);
-                i += len;
-                if (sv[i] == '-')
-                {
-                    ++i;
-                    char c2 = regex_char(sv.substr(i), len);
-                    cs.add_range(char_range{c1, c2});
-                }
-                else
-                    cs.set(utils::char_to_idx(c1));
-            }
-            if (flip)
-                cs.flip();
-        }
-        else
-        {
-            size_t len = 0;
-            cs.set(utils::char_to_idx(regex_char(sv, len)));
-        }
-
-        return cs;
-    }
-
-    template<typename Builder>
-    constexpr auto create_regex_parser(Builder& b)
-    {
-        using slice = utils::slice;
-        using namespace ftors;
-
-        constexpr nterm<slice> expr("expr");
-        constexpr nterm<slice> alt("alt");
-        constexpr nterm<slice> concat("concat");
-        constexpr nterm<slice> q_expr("q_expr");
-        constexpr nterm<slice> primary("primary");
-        constexpr nterm<size32_t> number("number");
-
-        constexpr custom_term regex_digit_09("regex_digit_09", [](auto sv) { return size32_t(sv[0]) - '0'; });
-        constexpr custom_term regex_primary("regex_primary", string_view_to_subset);
-
-        return parser(
-            expr,
-            terms(regex_digit_09, regex_primary, '*', '+', '?', '|', '(', ')', '{', '}'),
-            nterms(expr, alt, concat, q_expr, primary, number),
-            rules(
-                number(regex_digit_09),
-                number(number, regex_digit_09) >= [](size32_t n, size32_t x){ return n * 10 + x; },
-                primary(regex_digit_09) >= [&b](size32_t number){ return b.primary_char(char(number + '0')); },
-                primary(regex_primary) >= [&b](const auto& s){ return b.primary_subset(s); },
-                primary('(', expr, ')') >= _e2,
-                q_expr(primary),
-                q_expr(primary, '*') >= [&b](slice s, skip) { return b.star(s); },
-                q_expr(primary, '+') >= [&b](slice s, skip) { return b.plus(s); },
-                q_expr(primary, '?') >= [&b](slice s, skip) { return b.opt(s); },
-                q_expr(primary, '{', number, '}') >= [&b](slice s, skip, size32_t n, skip) { return b.rep(s, n); },
-                concat(q_expr),
-                concat(concat, q_expr) >= [&b](slice s1, slice s2) { return b.cat(s1, s2); },
-                alt(concat),
-                alt(alt, '|', alt) >= [&b](slice s1, skip, slice s2) { return b.alt(s1, s2); },
-                expr(alt)
-            ),
-            use_lexer<regex_lexer>{}
-        );
-    }
-
-    template<size_t N>
-    constexpr size32_t analyze_dfa_size(const char (&pattern)[N])
-    {
-        dfa_size_analyzer a;
-        auto p = create_regex_parser(a);
-        buffers::cstring_buffer buffer(pattern);
-        detail::no_stream s{};
-        auto res = p.parse(
-            parse_options{}.set_skip_whitespace(false),
-            buffer,
-            s);
-        if (!res.has_value())
-            throw std::runtime_error("invalid regex");
-        return res.value().n;
-    }
-
-    template<typename Stream>
-    constexpr void write_regex_parser_diag_msg(Stream& s)
-    {
-        regex::dfa_size_analyzer a;
-        auto p = regex::create_regex_parser(a);
-        p.write_diag_str(s);
-    }
-
-    template<auto& Pattern>
-    class expr
-    {
-    public:
-        static const size32_t dfa_size = analyze_dfa_size(Pattern);
-
-        constexpr expr()
-        {
-            dfa_builder<dfa_size> b(sm);
-            auto p = create_regex_parser(b);
-            detail::no_stream stream{};
-            auto s = p.parse(
-                parse_options{}.set_skip_whitespace(false),
-                buffers::cstring_buffer(Pattern),
-                stream
-            );
-            if (!s.has_value())
-                throw std::runtime_error("invalid regex");
-            b.mark_end_states(s.value(), 0);
-        }
-
-        template<typename Stream>
-        constexpr void debug_parse(Stream& s) const
-        {
-            regex::dfa_size_analyzer a;
-            auto p = regex::create_regex_parser(a);
-            p.parse(
-                parse_options{}.set_skip_whitespace(false).set_verbose(),
-                buffers::cstring_buffer(Pattern),
-                s
-            );
-        }
-
-        template<size_t N>
-        constexpr bool match(const char (&str)[N]) const
-        {
-            return match(buffers::cstring_buffer(str));
-        }
-
-        template<typename Buffer>
-        constexpr bool match(const Buffer& buf) const
-        {
-            detail::no_stream s;
-            return match(buf, s);
-        }
-
-        template<typename Buffer, typename Stream>
-        constexpr bool match(const Buffer& buf, Stream& s) const
-        {
-            return match(match_options{}, buf, s);
-        }
-
-        template<typename Buffer, typename Stream>
-        constexpr bool match(match_options opts, const Buffer& buf, Stream& s) const
-        {
-            auto res = dfa_match(sm, opts, source_point{}, buf.begin(), buf.end(), s);
-            if (res.term_idx == 0 && res.it == buf.end())
-                return true;
-            else
-            {
-                if (res.term_idx == 0)
-                    s << "Leftover text after recognition: " << buf.get_view(res.it, buf.end()) << "\n";
-                else
-                    s << "Unexpected char: " << utils::c_names.name(*res.it) << "\n";
-                return false;
-            }
-        }
-
-        template<typename Stream>
-        constexpr void write_diag_str(Stream& stream) const
-        {
-            regex::write_dfa_diag_str(sm, stream);
-        }
-
-    private:
-        dfa<dfa_size> sm;
-    };
-}
-
-template<auto& Pattern>
-class regex_term : public term
-{
-public:
-    using internal_value_type = std::string_view;
-
-    static const size_t dfa_size = regex::analyze_dfa_size(Pattern);
-    static const bool is_trivial = false;
-
-    static const size_t pattern_size = std::size(Pattern);
-
-    constexpr regex_term(associativity a = associativity::no_assoc) :
-        regex_term(nullptr, 0, a)
-    {}
-
-    constexpr regex_term(int precedence = 0, associativity a = associativity::no_assoc) :
-        regex_term(nullptr, precedence, a)
-    {}
-
-    constexpr regex_term(const char *custom_name, int precedence = 0, associativity a = associativity::no_assoc) :
-        term(precedence, a),
-        custom_name(custom_name)
-    {
-        id[0] = 'r';
-        id[1] = '_';
-        utils::copy_array(&id[2], Pattern, std::make_index_sequence<pattern_size>{});
-    }
-
-    constexpr const char* get_name() const { return custom_name ? custom_name : id; }
-    constexpr const char* get_id() const { return id; }
-    constexpr auto get_data() const { return regex::regex_pattern_data<pattern_size>{ Pattern }; }
-
-    constexpr const auto& get_ftor() const { return detail::pass_sv; }
-
-private:
-    char id[pattern_size + 2] = {};
-    const char* custom_name = nullptr;
-};
-
-} // namespace exaudf_ctpg
-
-#endif
diff --git a/exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.cc b/exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.cc
deleted file mode 100644
index fa7c0ba..0000000
--- a/exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.cc
+++ /dev/null
@@ -1,283 +0,0 @@
-#include "script_option_lines_ctpg.h"
-#include "ctpg.hpp"
-#include <iostream>
-#include <string>
-#include <sstream>
-#include "script_options_parser/exception.h"
-
-using namespace exaudf_ctpg;
-using namespace exaudf_ctpg::ftors;
-
-
-namespace ExecutionGraph
-{
-
-namespace OptionsLineParser
-{
-
-
-namespace CTPG {
-
-
-struct Option {
-    std::string key;
-    std::string value;
-    source_point start;
-    source_point end;
-};
-
-using options_type = std::vector<Option>;
-
-namespace ParserInternals {
-
-const auto empty_options()
-{
-    options_type ob;
-    return ob;
-}
-
-const auto to_options(Option&& e)
-{
-    options_type ob{e};
-    return ob;
-}
-
-const auto to_option(std::string_view key, std::string value, source_point sp_begin, source_point sp_end)
-{
-    return Option{std::string(key), value, sp_begin, sp_end};
-}
-
-auto&& add_option(Option&& e, options_type&& ob)
-{
-    ob.push_back(std::move(e));
-    return std::move(ob);
-}
-
-const auto convert_escape_seq(std::string_view escape_seq) {
-    std::string_view retVal;
-    if (escape_seq == R"_(\;)_") {
-        retVal = ";";
-    } else if (escape_seq == R"_(\n)_") {
-        retVal = "\n";
-    } else if (escape_seq == R"_(\r)_") {
-        retVal = "\r";
-    } else if (escape_seq == R"_(\\)_") {
-        retVal = "\\";
-    } else {
-        throw OptionParserException(std::string("Internal parser error: Unexpected escape sequence " + std::string(escape_seq)));
-    }
-
-    return retVal;
-}
-
-
-const auto convert_whitespace_escape_seq(std::string_view escape_seq) {
-    std::string_view retVal;
-    if (escape_seq == R"_(\ )_") {
-        retVal = " ";
-    } else if (escape_seq == R"_(\t)_") {
-        retVal = "\t";
-    } else if (escape_seq == R"_(\f)_") {
-        retVal = "\f";
-    } else if (escape_seq == R"_(\v)_") {
-        retVal = "\v";
-    } else {
-        throw OptionParserException(std::string("Internal parser error: Unexpected white space escape sequence " + std::string(escape_seq)));
-    }
-
-    return retVal;
-}
-
-
-
-constexpr char alpha_numeric_pattern[] = R"_([0-9a-zA-Z_]+)_";
-constexpr char not_semicolon_pattern[] = R"_([^;])_";
-constexpr char whitespaces_pattern[] = R"_([ \x09\x0c\x0b]+)_";
-constexpr char escape_pattern[] = R"_(\\;|\\n|\\r|\\\\)_";
-constexpr char whitespace_escape_pattern[] = R"_(\\ |\\t|\\f|\\v)_";
-
-
-
-constexpr char_term start_option_token('%');
-constexpr char_term end_option_token(';');
-constexpr regex_term<alpha_numeric_pattern> alpha_numeric("alpha_numeric");
-constexpr regex_term<not_semicolon_pattern> not_semicolon("not_semicolon");
-constexpr regex_term<whitespaces_pattern> whitespaces("whitespace");
-constexpr regex_term<escape_pattern> escape_seq("escape_seq");
-constexpr regex_term<whitespace_escape_pattern> whitespace_escape_seq("escape_seq");
-
-constexpr nterm<options_type> text("text");
-constexpr nterm<options_type> options("options");
-constexpr nterm<Option> option_element("option_element");
-constexpr nterm<int> rest("rest");
-constexpr nterm<std::string> option_value("option_value");
-
-
-constexpr parser option_parser(
-    text,
-    terms(start_option_token, escape_seq, whitespace_escape_seq, whitespaces, end_option_token, alpha_numeric, not_semicolon),
-    nterms(text, option_value, options, option_element, rest),
-    rules(
-        text(rest)
-            >= [] (skip) {return empty_options();},
-        text(options, rest)
-            >= [] (auto o, skip) {return o;},
-        text(options)
-            >= [] (auto o) {return o;},
-        options(option_element)
-            >= [](auto&& e) { return to_options(std::move(e)); },
-        options(options, option_element)
-            >= [](auto&& ob, auto&& e) { return add_option(std::move(e), std::move(ob)); },
-        option_element(start_option_token, alpha_numeric, whitespaces, option_value, end_option_token)
-            >= [](auto st, auto ok, skip, auto ov, auto e) { return to_option(ok.get_value(), ov, st.get_sp(), e.get_sp()); },
-        option_element(whitespaces, start_option_token, alpha_numeric, whitespaces, option_value, end_option_token)
-            >= [](skip, auto st, auto ok, skip, auto ov, auto e) { return to_option(ok.get_value(), ov, st.get_sp(), e.get_sp()); },
-        option_value(alpha_numeric)
-            >= [](auto o) { return std::string(o.get_value()); },
-        option_value(not_semicolon)
-            >= [](auto o) { return std::string(o.get_value()); },
-        option_value(whitespace_escape_seq)
-            >= [](auto o) { return std::string(convert_whitespace_escape_seq(o.get_value())); },
-        option_value(escape_seq)
-            >= [](auto es) { return convert_escape_seq(es.get_value()); },
-        option_value(option_value, not_semicolon)
-            >= [](auto&& ov, auto v) { return std::move(ov.append(v.get_value())); },
-        option_value(option_value, whitespace_escape_seq)
-            >= [](auto&& ov, auto es) { return std::move(ov.append(es.get_value())); },
-        option_value(option_value, escape_seq)
-            >= [](auto&& ov, auto es) { return std::move(ov.append(convert_escape_seq(es.get_value()))); },
-        option_value(option_value, start_option_token)
-            >= [](auto&& ov, auto v) { return std::move(ov.append("%")); },
-        option_value(option_value, alpha_numeric)
-            >= [](auto&& ov, auto v) { return std::move(ov.append(v.get_value())); },
-        option_value(option_value, whitespaces)
-            >= [](auto&& ov, auto v) { return std::move(ov.append(v.get_value())); },
-        rest(alpha_numeric)
-            >= [](auto r) { return 0;},
-        rest(whitespaces)
-            >= [](auto r) { return 0;},
-        rest(escape_seq)
-            >= [](auto r) { return 0;},
-        rest(whitespace_escape_seq)
-            >= [](auto r) { return 0;},
-        rest(end_option_token)
-            >= [](auto r) { return 0;},
-        rest(not_semicolon)
-            >= [](auto r) { return 0;},
-        rest(rest, alpha_numeric)
-            >= [](auto r, skip) { return 0;},
-        rest(rest, not_semicolon)
-            >= [](auto r, skip) { return 0;},
-        rest(rest, whitespaces)
-            >= [](auto r, skip) { return 0;},
-        rest(rest, end_option_token)
-            >= [](auto r, skip) { return 0;},
-        rest(rest, start_option_token)
-            >= [](auto r, skip) { return 0;},
-        rest(rest, escape_seq)
-            >= [](auto r, skip) { return 0;},
-        rest(rest, whitespace_escape_seq)
-            >= [](auto r, skip) { return 0;}
-    )
-);
-
-void parse(std::string&& code, options_type& result) {
-
-    std::stringstream error_buffer;
-    auto res = option_parser.parse(
-        parse_options{}.set_skip_whitespace(false),
-        buffers::string_buffer(std::move(code)),
-        error_buffer);
-    if (res.has_value()) {
-        result = res.value();
-    }
-    else {
-        throw OptionParserException(error_buffer.str());
-    }
-}
-
-} //namespace ParserInternals
-
-struct LinePositions {
-    size_t mStartPos;
-    size_t mEndPos;
-};
-
-inline std::optional<LinePositions> getNextLine(const size_t current_pos, const std::string & scriptCode) {
-    /**
-     * Find first of occurence of '%', starting search from position 'current_pos'.
-     * If no '%' is found, return an empty result.
-     * If '%' is found, search backwards from '%' for '\n' or \r':
-     *  1. If not found, '%' was found in the first line. Then we can set 'new_option_start_pos'=0
-     *  2. If found, set new_option_start_pos to position 1 char behind pos of found '\n' or '\r'.
-     * Then search forward for next occurence of '\n' or \r' and assign to var 'line_end_pos':
-        1. If not found, 'line_end_pos' will get assigned std::string::npos (std::string::substr(...,npos), returns substring until end of string
-        2. If found, 'line_end_pos' will assigned to position of line end of line where '%' was found
-     */
-    std::optional<LinePositions> retVal;
-    const size_t new_option_start_pos = scriptCode.find_first_of("%", current_pos);
-    if (new_option_start_pos == std::string::npos) {
-        return retVal;
-    }
-    size_t line_start_pos = scriptCode.find_last_of("\r\n", new_option_start_pos);
-    if (std::string::npos == line_start_pos) {
-        line_start_pos = 0;
-    }
-    else {
-        line_start_pos++;
-    }
-
-    const size_t line_end_pos = scriptCode.find_first_of("\r\n", line_start_pos);
-    retVal = LinePositions{ .mStartPos = line_start_pos, .mEndPos = line_end_pos};
-    return retVal;
-}
-
-void parseOptions(const std::string& code, options_map_t & result) {
-
-    size_t current_pos = 0;
-    std::optional<LinePositions> currentLinePositions = getNextLine(current_pos, code);
-    while (currentLinePositions) {
-
-        std::string line = code.substr(currentLinePositions->mStartPos,
-                                        currentLinePositions->mEndPos - currentLinePositions->mStartPos);
-        options_type parser_result;
-        try {
-            ParserInternals::parse(std::move(line), parser_result);
-        } catch(OptionParserException& ex) {
-            const std::string::difference_type lineNumber =
-                std::count(code.begin(), code.begin()+currentLinePositions->mStartPos, '\n');
-            std::stringstream ss;
-            ss << "Error parsing script options at line " << lineNumber << ": " << ex.what();
-            throw  OptionParserException(ss.str());
-        }
-        for (const auto & option: parser_result) {
-            ScriptOption entry = {
-                .value = option.value,
-                .idx_in_source = currentLinePositions->mStartPos + option.start.column - 1,
-                .size = option.end.column - option.start.column + 1
-            };
-            auto it_in_result = result.find(option.key);
-            if (it_in_result == result.end()) {
-                options_t new_options;
-                new_options.push_back(entry);
-                result.insert(std::make_pair(option.key, new_options));
-            }
-            else {
-                it_in_result->second.push_back(entry);
-            }
-        }
-        if (currentLinePositions->mEndPos == std::string::npos) {
-            break;
-        }
-        current_pos =  currentLinePositions->mEndPos + 1;
-
-        currentLinePositions = getNextLine(current_pos, code);
-    }
-}
-
-
-} // namespace CTPG
-
-} // namespace OptionsLineParser
-
-} // namespace ExecutionGraph
\ No newline at end of file
diff --git a/exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.h b/exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.h
deleted file mode 100644
index 8f893a2..0000000
--- a/exaudfclient/base/script_options_parser/ctpg/script_option_lines_ctpg.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef SCRIPTOPTIONLINESCTPG_H
-#define SCRIPTOPTIONLINESCTPG_H
-
-#include <string>
-#include <vector>
-#include <map>
-#include <ostream>
-
-namespace ExecutionGraph
-{
-
-namespace OptionsLineParser
-{
-
-namespace CTPG
-{
-
-struct ScriptOption {
-    std::string value;
-    size_t idx_in_source;
-    size_t size;
-
-    bool operator==(const ScriptOption & right) const {
-        return value == right.value && idx_in_source == right.idx_in_source && size == right.size;
-    }
-    /*
-    Useful for gtest to print proper content when comparison fails.
-    Copied the example from https://github.com/google/googletest/blob/main/docs/advanced.md#teaching-googletest-how-to-print-your-values
-    */
-    friend void PrintTo(const ScriptOption& option, std::ostream* os) {
-        *os << "(" << option.value << "," << option.idx_in_source << "," << option.size << ")";
-    }
-};
-
-using options_t = std::vector<ScriptOption>;
-
-using options_map_t = std::map<std::string, options_t>;
-
-/*!
- * \brief parseOptions Extracts syntactically valid options of form "%<option> <value>;" from UDF scripts.
- *
- * \param code Reference to string where the script code is stored.
- * \param result Result of all found options.
- * \param throwException Function to be called to throw exception.
- * \throws std::runtime_error if parsing fails
- */
-void parseOptions(const std::string& code, options_map_t & result);
-
-} //namespace CTPG
-
-} // namespace OptionsLineParser
-
-} // namespace ExecutionGraph
-
-#endif // SCRIPTOPTIONLINESCTPG_H
diff --git a/exaudfclient/base/script_options_parser/exception.h b/exaudfclient/base/script_options_parser/exception.h
deleted file mode 100644
index ff535c7..0000000
--- a/exaudfclient/base/script_options_parser/exception.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef SCRIPTOPTIONLINESEXCEPTION_H
-#define SCRIPTOPTIONLINESEXCEPTION_H
-
-#include <stdexcept>
-
-
-namespace ExecutionGraph
-{
-
-class OptionParserException : public std::runtime_error {
-    using std::runtime_error::runtime_error;
-};
-
-
-} // namespace ExecutionGraph
-
-#endif // SCRIPTOPTIONLINESEXCEPTION_H
\ No newline at end of file
diff --git a/exaudfclient/base/script_options_parser/legacy/BUILD b/exaudfclient/base/script_options_parser/legacy/BUILD
deleted file mode 100644
index 27fe42f..0000000
--- a/exaudfclient/base/script_options_parser/legacy/BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@rules_cc//cc:defs.bzl", "cc_library")
-
-cc_library(
-    name = "script_option_lines_parser_legacy",
-    hdrs = ["script_option_lines.h"],
-    srcs = ["script_option_lines.cc"],
-    deps = ["//script_options_parser:exception"],
-    copts= ["-fno-lto"],
-)
diff --git a/exaudfclient/base/script_options_parser/legacy/script_option_lines.cc b/exaudfclient/base/script_options_parser/legacy/script_option_lines.cc
deleted file mode 100644
index 7c45cea..0000000
--- a/exaudfclient/base/script_options_parser/legacy/script_option_lines.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-#include "script_option_lines.h"
-#include <string>
-#include <sstream>
-#include "script_options_parser/exception.h"
-
-
-
-namespace ExecutionGraph
-{
-
-std::string extractOptionLine(std::string& code, const std::string option, const std::string whitespace, const std::string lineEnd, size_t& pos)
-{
-    std::string result;
-    size_t startPos = code.find(option);
-    bool ignore_option = false;
-
-    if (startPos != std::string::npos)
-    {
-        // If there is anything other than whitespaces preceeding the option line, the option must be ignored.
-        // Look for line end character in the previous line.
-        size_t column_0 = code.find_last_of("\r\n", startPos);
-        // If line end character was not found, then the option must be on the first line in the script.
-        if (column_0 == std::string::npos)
-        {
-            // Look for first non white space character in the code.
-            size_t firstNonWhiteSpace = code.find_first_not_of(whitespace);
-            if (firstNonWhiteSpace == startPos)
-            {
-                // Set flag to NOT ignore the option.
-                ignore_option = false;
-            }
-            else
-            {
-                // Set flag to ignore the option.
-                ignore_option = true;
-            }
-        }
-        else
-        {
-            // column_0 is pointing at line end character in previous line.
-            // Increment it to point to first character of the line with option.
-            column_0++;
-            // Look for first character that is not whitespace
-            size_t firstNonWhiteSpaceInLine = code.find_first_not_of(whitespace, column_0);
-            if (firstNonWhiteSpaceInLine == startPos)
-            {
-                // Set flag to NOT ignore the option.
-                ignore_option = false;
-            }
-            else
-            {
-                // Set flag to ignore the option.
-                ignore_option = true;
-            }
-        }
-
-        if (!ignore_option)
-        {
-            // Process the option.
-            // Find the first value for the option.
-            size_t firstPos = startPos + option.length();
-            firstPos = code.find_first_not_of(whitespace, firstPos);
-            if (firstPos == std::string::npos) {
-                std::stringstream ss;
-                ss << "No values found for " << option << " statement";
-                throw OptionParserException(ss.str().c_str());
-            }
-            // Find the end of line.
-            size_t lastPos = code.find_first_of(lineEnd + "\r\n", firstPos);
-            if (lastPos == std::string::npos || code.compare(lastPos, lineEnd.length(), lineEnd) != 0) {
-                std::stringstream ss;
-                ss << "End of " << option << " statement not found";
-                throw OptionParserException(ss.str().c_str());
-            }
-            // If no values were found
-            if (firstPos >= lastPos) {
-                std::stringstream ss;
-                ss << "No values found for " << option << " statement";
-                throw OptionParserException(ss.str().c_str());
-            }
-            // If no values were found
-            size_t optionsEnd = code.find_last_not_of(whitespace, lastPos - 1);
-            if (optionsEnd == std::string::npos || optionsEnd < firstPos) {
-                std::stringstream ss;
-                ss << "No values found for " << option << " statement";
-                throw OptionParserException(ss.str().c_str());
-            }
-            result = code.substr(firstPos, optionsEnd - firstPos + 1);
-            code.erase(startPos, lastPos - startPos + 1);
-            pos = startPos;
-        }
-        else
-        {
-            // Ignore the option.
-            pos = std::string::npos;
-        }
-    }
-    else
-    {
-        // Option was not found.
-        pos = std::string::npos;
-    }
-    return result;
-}
-
-
-} // namespace ExecutionGraph
diff --git a/exaudfclient/base/script_options_parser/legacy/script_option_lines.h b/exaudfclient/base/script_options_parser/legacy/script_option_lines.h
deleted file mode 100644
index 00670a7..0000000
--- a/exaudfclient/base/script_options_parser/legacy/script_option_lines.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef SCRIPTOPTIONLINES_H
-#define SCRIPTOPTIONLINES_H
-
-#include <string>
-
-namespace ExecutionGraph
-{
-
-
-/*!
- * \brief extractOptionLine Extracts syntactically valid option lines of form %<option> <values> [<values>] from UDF scripts.
- *
- * \param code Reference to string where the script code is stored.
- * \param option Option to be extracted. eg. "jvmoption", "jar", "env" etc.
- * \param whitespace String of characters that should be treated as white space characters.
- * \param lineEnd String of characters that should be treated as line end characters.
- * \param pos If option is found, contains the start position of the option. Otherwise, contains std::string::npos.
- * \throws std::runtime_error if parser fails.
- *
- * \return String with the option line.
- */
-std::string extractOptionLine(std::string& code, const std::string option, const std::string whitespace, const std::string lineEnd, size_t& pos);
-
-} // namespace ExecutionGraph
-
-#endif // SCRIPTOPTIONLINES_H
\ No newline at end of file

From 3fd99442ac9f6d0707480424999221491898a47c Mon Sep 17 00:00:00 2001
From: "Shankar.KV" <shankar.vaithiyanadhaswamy@exasol.com>
Date: Thu, 27 Aug 2026 19:09:49 +0530
Subject: [PATCH 5/8] Remove java build and dependency configuration

---
 emulator/exasolution.py                          | 11 ++---------
 exaudfclient/.bazelrc                            |  1 -
 exaudfclient/.env.template                       |  3 +--
 exaudfclient/BUILD                               |  3 ---
 exaudfclient/MODULE.bazel                        | 16 ----------------
 exaudfclient/base/.bazelrc                       |  1 -
 exaudfclient/base/BUILD                          |  7 +------
 exaudfclient/base/MODULE.bazel                   | 16 ----------------
 exaudfclient/base/benchmark_container/BUILD      |  4 ++--
 exaudfclient/base/exaudflib/zmqcontainer.proto   |  1 -
 exaudfclient/base/variables.bzl                  |  6 +-----
 exaudfclient/build_local_all.sh                  |  2 +-
 exaudfclient/run_local.sh                        |  2 +-
 exaudfclient/variables.bzl                       |  7 +------
 ext/lima_vm_templates/docker-udf-client.yaml     |  5 ++---
 ext/scripts/security_scan/run_trivy.sh           |  6 +++---
 .../flavor_base/build_run/Dockerfile             |  2 +-
 .../flavor_base/packages.yml                     |  3 ---
 .../flavor_base/build_run/Dockerfile             |  2 +-
 .../flavor_base/packages.yml                     |  3 ---
 scripts/installUdfClientDeps.sh                  |  2 +-
 21 files changed, 18 insertions(+), 85 deletions(-)

diff --git a/emulator/exasolution.py b/emulator/exasolution.py
index 609922f..d249da2 100644
--- a/emulator/exasolution.py
+++ b/emulator/exasolution.py
@@ -125,8 +125,7 @@ def parse_number(num):
     input_file = output_file_fd = output_file = script_lines = script_input_defs = script_output_defs = None
 
 if not single_call_mode:
-    if script_name.endswith('.java'): comment = '//'
-    else: comment = '#'
+    comment = '#'
     for line in script_lines:
         if line.startswith(comment + 'input_column:'):
             script_input_defs.append(line[len(comment + 'input_column:'):])
@@ -301,12 +300,6 @@ def handle_client():
     #response.info.vm_type = PB_VM_EXTERNAL
     response.info.maximal_memory_limit = memory_limit
     response.info.meta_info = meta_info
-    #if redirector_name != None: response.info.vm_type = PB_VM_EXTERNAL
-    #else:
-    #    if script_name.endswith('.py'): response.info.vm_type = PB_VM_PYTHON
-    #    elif script_name.endswith('.R'): response.info.vm_type = PB_VM_R
-    #    elif script_name.endswith('.java'): response.info.vm_type = PB_VM_JAVA
-    #    else: raise RuntimeError("Unsupported VM type")
     send_message(response.SerializeToString())
     initialized = True
 
@@ -355,7 +348,7 @@ def handle_import():
     if kind == PB_IMPORT_SCRIPT_CODE:
         if script_name.endswith('.py'): fname = fname + '.py'
         elif script_name.endswith('.R'): fname = fname + '.R'
-        else: fname = fname + '.java'
+        else: raise RuntimeError("Unsupported script language")
         try: getattr(response, 'import').source_code = open(fname).read()
         except Exception, err:
             response.exception_message = str(err)
diff --git a/exaudfclient/.bazelrc b/exaudfclient/.bazelrc
index 3744dc3..4e4676e 100644
--- a/exaudfclient/.bazelrc
+++ b/exaudfclient/.bazelrc
@@ -1,7 +1,6 @@
 build --lockfile_mode=off --copt='-std=c++17' --force_pic --action_env=PROTOBUF_BIN --action_env=PROTOBUF_LIBRARY_PREFIX --action_env=PROTOBUF_INCLUDE_PREFIX
 # TODO add environment variables for R libraries
 build:benchmark --define benchmark=true
-build:java  --define java=true --action_env=JAVA_PREFIX
 build:python --define python=true --action_env=NUMPY_PREFIX --action_env=PYTHON3_SYSPATH --action_env=PYTHON3_PREFIX --action_env=PYTHON3_VERSION
 build:fast-binary --define binary_type=fast_binary //:exaudfclient
 build:slow-wrapper --define binary_type=slow_wrapper //:exaudfclient
diff --git a/exaudfclient/.env.template b/exaudfclient/.env.template
index de12eee..684c76e 100644
--- a/exaudfclient/.env.template
+++ b/exaudfclient/.env.template
@@ -1,4 +1,3 @@
-export JAVA_PREFIX=
 export PYTHON3_PREFIX=
 export PYTHON3_VERSION=
 export PROTOBUF_BIN=
@@ -8,4 +7,4 @@ export OPENSSL_LIBRARY_PREFIX=
 export OPENSSL_INCLUDE_PREFIX=
 export VERBOSE_BUILD= #"--subcommands --verbose_failures"
 export ZMQ_LIBRARY_PREFIX=
-export ZMQ_INCLUDE_PREFIX=
\ No newline at end of file
+export ZMQ_INCLUDE_PREFIX=
diff --git a/exaudfclient/BUILD b/exaudfclient/BUILD
index ef4505d..08cfedf 100644
--- a/exaudfclient/BUILD
+++ b/exaudfclient/BUILD
@@ -7,9 +7,6 @@ load("@rules_shell//shell:sh_library.bzl", "sh_library")
 VM_ENABLED_DEPS=select({
         "@exaudfclient_base//:benchmark": ["@exaudfclient_base//benchmark_container:benchmark_container"],
         "//conditions:default": []
-    }) + select({
-        "@exaudfclient_base//:java": ["@exaudfclient_base//javacontainer:javacontainer"],
-        "//conditions:default": []
     }) + select({
         "@exaudfclient_base//:bash": ["@exaudfclient_base//streaming_container:streamingcontainer"],
         "//conditions:default": []
diff --git a/exaudfclient/MODULE.bazel b/exaudfclient/MODULE.bazel
index bcc3f18..b445d66 100644
--- a/exaudfclient/MODULE.bazel
+++ b/exaudfclient/MODULE.bazel
@@ -5,7 +5,6 @@ bazel_dep(name = "exaudfclient_base", version = "1.0.0")
 #Later we might fetch it via Http or Git (after splitting up script-languages repository)
 local_path_override(module_name="exaudfclient_base", path="base")
 bazel_dep(name = "rules_cc", version = "0.2.22")
-bazel_dep(name = "rules_jvm_external", version = "6.7")
 bazel_dep(name = "rules_shell", version = "0.8.0")
 
 numpy_local_repository = use_repo_rule("@exaudfclient_base//:python_repository.bzl", "numpy_local_repository")
@@ -19,18 +18,3 @@ zmq_local_repository(name = "zmq")
 
 protobuf_local_repository = use_repo_rule("@exaudfclient_base//:protobuf_repository.bzl", "protobuf_local_repository")
 protobuf_local_repository(name = "protobuf")
-
-java_local_repository = use_repo_rule("@exaudfclient_base//:java_repository.bzl", "java_local_repository")
-java_local_repository(name = "java")
-
-
-maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
-maven.install(
-    artifacts = [
-        "com.exasol:udf-api-java:1.0.5",
-    ],
-    repositories = [
-        "https://repo1.maven.org/maven2",
-    ],
-)
-use_repo(maven, "maven")
diff --git a/exaudfclient/base/.bazelrc b/exaudfclient/base/.bazelrc
index 4a15be7..c6d0048 100644
--- a/exaudfclient/base/.bazelrc
+++ b/exaudfclient/base/.bazelrc
@@ -1,6 +1,5 @@
 build --lockfile_mode=off --copt='-std=c++17' --force_pic --action_env=PROTOBUF_BIN --action_env=PROTOBUF_LIBRARY_PREFIX --action_env=PROTOBUF_INCLUDE_PREFIX
 build:benchmark --define benchmark=true
-build:java  --define java=true --action_env=JAVA_PREFIX
 build:python --define python=true --action_env=NUMPY_PREFIX --action_env=PYTHON3_SYSPATH --action_env=PYTHON3_PREFIX --action_env=PYTHON3_VERSION
 build:debug-build --sandbox_debug --config=verbose
 build:no-symlinks --symlink_prefix=/
diff --git a/exaudfclient/base/BUILD b/exaudfclient/base/BUILD
index 55de850..5f857bf 100644
--- a/exaudfclient/base/BUILD
+++ b/exaudfclient/base/BUILD
@@ -1,6 +1,6 @@
 
 package(default_visibility = ["//visibility:public"])
-exports_files(["filter_swig_code.py", "build_integrated.py",
+exports_files(["build_integrated.py",
 	       "create_binary_wrapper.sh", "create_binary_wrapper_valgrind.sh",
 	       "create_binary_wrapper_valgrind_massif.sh", "exaudfclient.template.sh",
 	       "replace_swig_import_helper.py"])
@@ -18,11 +18,6 @@ config_setting(
     define_values = {"python": "true"},
 )
 
-config_setting(
-    name = "java",
-    define_values = {"java": "true"},
-)
-
 config_setting(
     name = "bash",
     define_values = {"bash": "true"},
diff --git a/exaudfclient/base/MODULE.bazel b/exaudfclient/base/MODULE.bazel
index eedf459..8cb18b7 100644
--- a/exaudfclient/base/MODULE.bazel
+++ b/exaudfclient/base/MODULE.bazel
@@ -3,9 +3,7 @@ module(name="exaudfclient_base", version = "1.0")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "googletest", version = "1.15.0")
 bazel_dep(name = "rules_cc", version = "0.2.22")
-bazel_dep(name = "rules_jvm_external", version = "6.2")
 
-# The following is necessary to build the UDF client for Java
 # Since Bazel >8 the Python hermetic build rules must not run as root
 # However, since the UDF client is built as root in a docker container
 # we must disable this behavior. The only way is to configure the Python hermetic toolchain
@@ -27,17 +25,3 @@ zmq_local_repository(name = "zmq")
 
 protobuf_local_repository = use_repo_rule("@exaudfclient_base//:protobuf_repository.bzl", "protobuf_local_repository")
 protobuf_local_repository(name = "protobuf")
-
-java_local_repository = use_repo_rule("@exaudfclient_base//:java_repository.bzl", "java_local_repository")
-java_local_repository(name = "java")
-
-maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
-maven.install(
-    artifacts = [
-        "com.exasol:udf-api-java:1.0.5",
-    ],
-    repositories = [
-        "https://repo1.maven.org/maven2",
-    ],
-)
-use_repo(maven, "maven")
diff --git a/exaudfclient/base/benchmark_container/BUILD b/exaudfclient/base/benchmark_container/BUILD
index 9aca9dd..c591e6a 100644
--- a/exaudfclient/base/benchmark_container/BUILD
+++ b/exaudfclient/base/benchmark_container/BUILD
@@ -6,5 +6,5 @@ cc_library(
     name = "benchmark_container",
     srcs = ["benchmark_container.cc","benchmark_container.h"],
     hdrs = ["benchmark_container.h"],
-    deps = ["//exaudflib:exaudflib-deps","//exaudflib:header", "//utils:utils"]+["//script_options_parser:scriptoptionlines"]
-)
\ No newline at end of file
+    deps = ["//exaudflib:exaudflib-deps","//exaudflib:header", "//utils:utils"]
+)
diff --git a/exaudfclient/base/exaudflib/zmqcontainer.proto b/exaudfclient/base/exaudflib/zmqcontainer.proto
index 7d7e085..5cbca1d 100644
--- a/exaudfclient/base/exaudflib/zmqcontainer.proto
+++ b/exaudfclient/base/exaudflib/zmqcontainer.proto
@@ -83,7 +83,6 @@ enum exascript_vmtype {
     PB_VM_JAVASCRIPT = 3;
     PB_VM_R = 4;
     PB_VM_EXTERNAL = 5;
-    PB_VM_JAVA = 6;
     PM_VM_PLUGIN_LANGUAGE = 7;
 }
 */
diff --git a/exaudfclient/base/variables.bzl b/exaudfclient/base/variables.bzl
index ef06b43..a7ebd5d 100644
--- a/exaudfclient/base/variables.bzl
+++ b/exaudfclient/base/variables.bzl
@@ -10,12 +10,8 @@ PYTHON_VM_ENABLED_DEFINE=select({
         "//:python": ["ENABLE_PYTHON_VM"],
         "//conditions:default": []
     })
-JAVA_VM_ENABLED_DEFINE=select({
-        "//:java": ["ENABLE_JAVA_VM"],
-        "//conditions:default": []
-    })
 PLUGIN_CLIENT_ENABLED_DEFINE=select({
         "//:plugin_client": ["UDF_PLUGIN_CLIENT"],
         "//conditions:default": []
     })
-VM_ENABLED_DEFINES=BENCHMARK_VM_ENABLED_DEFINE+PYTHON_VM_ENABLED_DEFINE+JAVA_VM_ENABLED_DEFINE+STREAMING_VM_ENABLED_DEFINE+PLUGIN_CLIENT_ENABLED_DEFINE
+VM_ENABLED_DEFINES=BENCHMARK_VM_ENABLED_DEFINE+PYTHON_VM_ENABLED_DEFINE+STREAMING_VM_ENABLED_DEFINE+PLUGIN_CLIENT_ENABLED_DEFINE
diff --git a/exaudfclient/build_local_all.sh b/exaudfclient/build_local_all.sh
index c91abe5..9bac633 100755
--- a/exaudfclient/build_local_all.sh
+++ b/exaudfclient/build_local_all.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bash build_local.sh "$@" --config no-tty --config python --config java --config slow-wrapper
+bash build_local.sh "$@" --config no-tty --config python --config slow-wrapper
diff --git a/exaudfclient/run_local.sh b/exaudfclient/run_local.sh
index 64486f1..e9a3a23 100644
--- a/exaudfclient/run_local.sh
+++ b/exaudfclient/run_local.sh
@@ -4,4 +4,4 @@
 #shellcheck disable=SC1091
 source .env
 export VERBOSE_BUILD="--subcommands --verbose_failures"
-bash run.sh --define streaming=true --define python=true --define java=true --define benchmark=true --define r=true "$@"
\ No newline at end of file
+bash run.sh --define streaming=true --define python=true --define benchmark=true --define r=true "$@"
diff --git a/exaudfclient/variables.bzl b/exaudfclient/variables.bzl
index 7448649..0d5fc1b 100644
--- a/exaudfclient/variables.bzl
+++ b/exaudfclient/variables.bzl
@@ -10,9 +10,4 @@ PYTHON_VM_ENABLED_DEFINE=select({
         "@exaudfclient_base//:python": ["ENABLE_PYTHON_VM"],
         "//conditions:default": []
     })
-JAVA_VM_ENABLED_DEFINE=select({
-        "@exaudfclient_base//:java": ["ENABLE_JAVA_VM"],
-        "//conditions:default": []
-    })
-
-VM_ENABLED_DEFINES=BENCHMARK_VM_ENABLED_DEFINE+PYTHON_VM_ENABLED_DEFINE+JAVA_VM_ENABLED_DEFINE+STREAMING_VM_ENABLED_DEFINE
+VM_ENABLED_DEFINES=BENCHMARK_VM_ENABLED_DEFINE+PYTHON_VM_ENABLED_DEFINE+STREAMING_VM_ENABLED_DEFINE
diff --git a/ext/lima_vm_templates/docker-udf-client.yaml b/ext/lima_vm_templates/docker-udf-client.yaml
index a4b8f9a..f091423 100644
--- a/ext/lima_vm_templates/docker-udf-client.yaml
+++ b/ext/lima_vm_templates/docker-udf-client.yaml
@@ -1,6 +1,6 @@
 # A template to use Docker (rootful) instead of containerd & nerdctl
 # And provide all dependencies necessary to build the Exasol UDF client with Bazel
-# Also, it sets all environment variables needed to build the UDF client for Python and Java
+# Also, it sets all environment variables needed to build the UDF client for Python
 # TODO: Add R dependencies
 # $ limactl start ./docker-udf-client.yaml
 # cd ./exaudfclient
@@ -48,7 +48,7 @@ provision:
 - mode: system
   script: |
    export DEBIAN_FRONTEND=noninteractive
-   apt update && apt install -y protobuf-compiler libzmq3-dev openjdk-17-jdk build-essential git python3.12-dev python3-pip libpcre3-dev clang-tidy-20
+   apt update && apt install -y protobuf-compiler libzmq3-dev build-essential git python3.12-dev python3-pip libpcre3-dev clang-tidy-20
    curl -L  https://github.com/bazelbuild/bazelisk/releases/download/v1.27.0/bazelisk-linux-amd64 -o /usr/bin/bazel
    chmod +x /usr/bin/bazel
    pip install --break-system-packages numpy
@@ -96,7 +96,6 @@ env:
    PROTOBUF_INCLUDE_PREFIX: /usr/include/
    PROTOBUF_BIN: /usr/bin/protoc
    USE_BAZEL_VERSION: 8.4.2
-   JAVA_PREFIX: /usr/lib/jvm/java-17-openjdk-amd64
    EXASOL_TELEMETRY_DISABLE: yes
 mounts:
   - location: "~"
diff --git a/ext/scripts/security_scan/run_trivy.sh b/ext/scripts/security_scan/run_trivy.sh
index 0047490..be3cdbb 100755
--- a/ext/scripts/security_scan/run_trivy.sh
+++ b/ext/scripts/security_scan/run_trivy.sh
@@ -20,8 +20,8 @@ popd
 
 output_path=$1
 
-trivy rootfs  --no-progress --offline-scan --format json --timeout 15m0s --skip-java-db-update --skip-db-update --config /trivy.yaml --output "$output_path/trivy_report.json" / > /dev/null
+trivy rootfs  --no-progress --offline-scan --format json --timeout 15m0s --skip-db-update --config /trivy.yaml --output "$output_path/trivy_report.json" / > /dev/null
 #run with format table and print to stdout
-trivy rootfs --no-progress --offline-scan --format table --timeout 15m0s --skip-java-db-update --skip-db-update --config /trivy.yaml --output "$output_path/trivy_report.txt" / > /dev/null
+trivy rootfs --no-progress --offline-scan --format table --timeout 15m0s --skip-db-update --config /trivy.yaml --output "$output_path/trivy_report.txt" / > /dev/null
 #Force script to return with error if a high or critical issue is found
-trivy rootfs --no-progress --offline-scan --timeout 15m0s --skip-db-update --skip-java-db-update --config /trivy.yaml --show-suppressed --severity "HIGH,CRITICAL" --exit-code 1 /
\ No newline at end of file
+trivy rootfs --no-progress --offline-scan --timeout 15m0s --skip-db-update --config /trivy.yaml --show-suppressed --severity "HIGH,CRITICAL" --exit-code 1 /
diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10/flavor_base/build_run/Dockerfile
index a823158..f701d51 100644
--- a/flavors/template-Exasol-all-python-3.10/flavor_base/build_run/Dockerfile
+++ b/flavors/template-Exasol-all-python-3.10/flavor_base/build_run/Dockerfile
@@ -29,7 +29,7 @@ RUN exaslpm export-variables --out-file /env
 WORKDIR /exaudfclient/
 RUN ["/bin/bash", "-c", "source /env && bash build.sh --config no-tty --config optimize --config python --config fast-binary"]
 RUN cp -r -L bazel-bin/* /exaudf
-RUN rm -r /root/.cache/bazel #Delete bazel cache as it contains java rules with special characters which will cause a problem for Bucketfs
+RUN rm -r /root/.cache/bazel
 
 WORKDIR /exaudfclient/base
 RUN ./test_udfclient.sh /exaudf/exaudfclient
diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/packages.yml b/flavors/template-Exasol-all-python-3.10/flavor_base/packages.yml
index 762c215..06acf1c 100644
--- a/flavors/template-Exasol-all-python-3.10/flavor_base/packages.yml
+++ b/flavors/template-Exasol-all-python-3.10/flavor_base/packages.yml
@@ -31,8 +31,6 @@ build_steps:
         version: 1.34+dfsg-1ubuntu*
       - name: curl
         version: 7.81.0-1ubuntu*
-      - name: openjdk-11-jdk-headless
-        version: 11.0.31+11-1ubuntu*
       - name: build-essential
         version: 12.9ubuntu*
       - name: libpcre3-dev
@@ -43,7 +41,6 @@ build_steps:
         version: 0.16-2
     variables:
       PROTOBUF_BIN: /usr/bin/protoc
-      JAVA_HOME: /usr/lib/jvm/java-1.11.0-openjdk-{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}
   - name: install_bazel
     tools:
       bazel:
diff --git a/flavors/template-Exasol-all-python-3.12/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.12/flavor_base/build_run/Dockerfile
index 7082116..a22c21d 100644
--- a/flavors/template-Exasol-all-python-3.12/flavor_base/build_run/Dockerfile
+++ b/flavors/template-Exasol-all-python-3.12/flavor_base/build_run/Dockerfile
@@ -28,7 +28,7 @@ COPY exaudfclient/ /exaudfclient/
 WORKDIR /exaudfclient/
 RUN ["/bin/bash", "-c", "source /env && bash build.sh --config no-tty --config optimize --config python --config fast-binary"]
 RUN cp -r -L bazel-bin/* /exaudf
-RUN rm -r /root/.cache/bazel #Delete bazel cache as it contains java rules with special characters which will cause a problem for Bucketfs
+RUN rm -r /root/.cache/bazel
 
 WORKDIR /exaudfclient/base
 RUN ./test_udfclient.sh /exaudf/exaudfclient
diff --git a/flavors/template-Exasol-all-python-3.12/flavor_base/packages.yml b/flavors/template-Exasol-all-python-3.12/flavor_base/packages.yml
index c4e5120..c95ad01 100644
--- a/flavors/template-Exasol-all-python-3.12/flavor_base/packages.yml
+++ b/flavors/template-Exasol-all-python-3.12/flavor_base/packages.yml
@@ -10,8 +10,6 @@ build_steps:
         version: 1.35+dfsg-3ubuntu*
       - name: curl
         version: 8.5.0-2ubuntu*
-      - name: openjdk-17-jdk
-        version: 17.0.19+10-1~24.04.2
       - name: build-essential
         version: 12.10ubuntu*
       - name: libpcre3-dev
@@ -24,7 +22,6 @@ build_steps:
         version: 2.39-0ubuntu*
     variables:
       PROTOBUF_BIN: /usr/bin/protoc
-      JAVA_HOME: /usr/lib/jvm/java-1.17.0-openjdk-{% if platform == 'x86_64' %}amd64{% else %}arm64{% endif %}
   - name: install_bazel
     tools:
       bazel:
diff --git a/scripts/installUdfClientDeps.sh b/scripts/installUdfClientDeps.sh
index 83c0b69..f7021a0 100644
--- a/scripts/installUdfClientDeps.sh
+++ b/scripts/installUdfClientDeps.sh
@@ -21,7 +21,7 @@ OUT_ENV_FILE="$1"
 export DEBIAN_FRONTEND=noninteractive
 
 apt update
-apt install -y curl openjdk-11-jdk libzmq3-dev python3 protobuf-compiler build-essential python3-pip libpcre3-dev chrpath tar locales coreutils libssl-dev
+apt install -y curl libzmq3-dev python3 protobuf-compiler build-essential python3-pip libpcre3-dev chrpath tar locales coreutils libssl-dev
 
 BAZEL_PACKAGE_VERSION="7.2.1"
 BAZEL_PACKAGE_FILE="bazel_$BAZEL_PACKAGE_VERSION-linux-x86_64.deb"

From 1873c189985ae345d2acfd114911c0d38c37d0cb Mon Sep 17 00:00:00 2001
From: "Shankar.KV" <shankar.vaithiyanadhaswamy@exasol.com>
Date: Thu, 27 Aug 2026 19:32:15 +0530
Subject: [PATCH 6/8] Bring back the missing CA certificates

---
 .../template-Exasol-all-python-3.10/flavor_base/packages.yml    | 2 ++
 .../template-Exasol-all-python-3.12/flavor_base/packages.yml    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/packages.yml b/flavors/template-Exasol-all-python-3.10/flavor_base/packages.yml
index 06acf1c..b06d0c0 100644
--- a/flavors/template-Exasol-all-python-3.10/flavor_base/packages.yml
+++ b/flavors/template-Exasol-all-python-3.10/flavor_base/packages.yml
@@ -31,6 +31,8 @@ build_steps:
         version: 1.34+dfsg-1ubuntu*
       - name: curl
         version: 7.81.0-1ubuntu*
+      - name: ca-certificates
+        version: 20260601~22.04.1
       - name: build-essential
         version: 12.9ubuntu*
       - name: libpcre3-dev
diff --git a/flavors/template-Exasol-all-python-3.12/flavor_base/packages.yml b/flavors/template-Exasol-all-python-3.12/flavor_base/packages.yml
index c95ad01..6832024 100644
--- a/flavors/template-Exasol-all-python-3.12/flavor_base/packages.yml
+++ b/flavors/template-Exasol-all-python-3.12/flavor_base/packages.yml
@@ -10,6 +10,8 @@ build_steps:
         version: 1.35+dfsg-3ubuntu*
       - name: curl
         version: 8.5.0-2ubuntu*
+      - name: ca-certificates
+        version: '20260601~24.04.1'
       - name: build-essential
         version: 12.10ubuntu*
       - name: libpcre3-dev

From 28b5d584946d1814b415765ff306392947f1ba77 Mon Sep 17 00:00:00 2001
From: "Shankar.KV" <shankar.vaithiyanadhaswamy@exasol.com>
Date: Thu, 27 Aug 2026 22:00:20 +0530
Subject: [PATCH 7/8] Install Java runtime required by EXAplus

---
 test_container/build/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test_container/build/Dockerfile b/test_container/build/Dockerfile
index f8fd19d..d13dedc 100644
--- a/test_container/build/Dockerfile
+++ b/test_container/build/Dockerfile
@@ -5,6 +5,7 @@ COPY deps/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
 
 RUN apt-get -y update && \
     apt-get -y install \
+        openjdk-11-jre-headless \
         locales \
         python3.10-venv \
         python3-pip \

From 13b69c33d085a0a0eccdba840aeee8c4d440f37f Mon Sep 17 00:00:00 2001
From: "Shankar.KV" <shankar.vaithiyanadhaswamy@exasol.com>
Date: Mon, 31 Aug 2026 13:03:04 +0530
Subject: [PATCH 8/8] accommodating all recent comments

---
 exaudfclient/README.md                                         | 3 +--
 exaudfclient/exa_udfclient_binary_common/exa_udf_client.cc     | 2 +-
 exaudfclient/exa_udfclient_binary_common/exa_vm_factory.cc     | 2 +-
 exaudfclient/exa_udfclient_binary_common/exa_vm_factory.h      | 2 +-
 exaudfclient/run_local.sh                                      | 2 +-
 ext/lima_vm_templates/docker-udf-client.yaml                   | 1 -
 .../template-Exasol-all-python-3.10/flavor_base/packages.yml   | 2 ++
 .../template-Exasol-all-python-3.12/flavor_base/packages.yml   | 2 ++
 test_container/build/Dockerfile                                | 2 +-
 9 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/exaudfclient/README.md b/exaudfclient/README.md
index b2e03c2..b95fb58 100644
--- a/exaudfclient/README.md
+++ b/exaudfclient/README.md
@@ -1,6 +1,6 @@
 # What is the exaudfclient?
 
-The exaudfclient connects to the database via [ZeroMQ](http://zeromq.org/) and fetches the tuples which then get processed by the user-defined functions (UDFs). Currently, the exaudfclient supports UDFs in Python and R. Further languages can be integrated via language binding between C/C++ and the desired language. Python 3 and R use [SWIG](http://www.swig.org/) for the language binding.
+The exaudfclient connects to the database via [ZeroMQ](http://zeromq.org/) and fetches the tuples which then get processed by the user-defined functions (UDFs). Currently, the exaudfclient supports UDFs in Python. Further languages can be integrated via language binding between C/C++ and the desired language. Python 3 uses [SWIG](http://www.swig.org/) for the language binding.
 
 # How to build the exaudfclient?
 
@@ -22,7 +22,6 @@ For the language support:
 
 - Python 3.10 for pythoncontainer
     - for Python 3 the build requires [Numpy](https://www.numpy.org/) and [Pandas](https://pandas.pydata.org/) in addition for the Pandas Dataframe Support
-- R 4.4 for the rcontainer
 
 ## Start a build
 
diff --git a/exaudfclient/exa_udfclient_binary_common/exa_udf_client.cc b/exaudfclient/exa_udfclient_binary_common/exa_udf_client.cc
index 38e53bd..3b5ea09 100644
--- a/exaudfclient/exa_udfclient_binary_common/exa_udf_client.cc
+++ b/exaudfclient/exa_udfclient_binary_common/exa_udf_client.cc
@@ -33,5 +33,5 @@ void ExaUdfClient::usage(const std::string& programName) {
 }
 
 std::function<SWIGVMContainers::SWIGVM*()> ExaUdfClient::create_vm() {
-    return ::create_vm(m_languageArg);
+    return ::create_vm(m_languageArg, false);
 }
diff --git a/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.cc b/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.cc
index eb40110..b6a3770 100644
--- a/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.cc
+++ b/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.cc
@@ -14,7 +14,7 @@
 #include "benchmark_container/benchmark_container.h"
 #endif
 
-std::function<SWIGVMContainers::SWIGVM*()> create_vm(const std::string& argv_lang) {
+std::function<SWIGVMContainers::SWIGVM*()> create_vm(const std::string& argv_lang, bool use_ctpg_options_parser) {
     if(argv_lang.compare("lang=python") == 0) {
         #ifdef ENABLE_PYTHON_VM
             char *path_var = getenv("PATH");
diff --git a/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.h b/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.h
index 750abc4..7d9e306 100644
--- a/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.h
+++ b/exaudfclient/exa_udfclient_binary_common/exa_vm_factory.h
@@ -1,4 +1,4 @@
 #pragma once
 #include "exaudflib/vm/swig_vm.h"
 
-std::function<SWIGVMContainers::SWIGVM*()> create_vm(const std::string& argv_lang);
+std::function<SWIGVMContainers::SWIGVM*()> create_vm(const std::string& argv_lang, bool use_ctpg_options_parser);
diff --git a/exaudfclient/run_local.sh b/exaudfclient/run_local.sh
index e9a3a23..68368ec 100644
--- a/exaudfclient/run_local.sh
+++ b/exaudfclient/run_local.sh
@@ -4,4 +4,4 @@
 #shellcheck disable=SC1091
 source .env
 export VERBOSE_BUILD="--subcommands --verbose_failures"
-bash run.sh --define streaming=true --define python=true --define benchmark=true --define r=true "$@"
+bash run.sh --define streaming=true --define python=true --define benchmark=true "$@"
diff --git a/ext/lima_vm_templates/docker-udf-client.yaml b/ext/lima_vm_templates/docker-udf-client.yaml
index f091423..66414eb 100644
--- a/ext/lima_vm_templates/docker-udf-client.yaml
+++ b/ext/lima_vm_templates/docker-udf-client.yaml
@@ -1,7 +1,6 @@
 # A template to use Docker (rootful) instead of containerd & nerdctl
 # And provide all dependencies necessary to build the Exasol UDF client with Bazel
 # Also, it sets all environment variables needed to build the UDF client for Python
-# TODO: Add R dependencies
 # $ limactl start ./docker-udf-client.yaml
 # cd ./exaudfclient
 # $ limactl shell docker-udf-client bazel build --config no-tty --config optimize --config python --config fast-binary
diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/packages.yml b/flavors/template-Exasol-all-python-3.10/flavor_base/packages.yml
index b06d0c0..2219ef1 100644
--- a/flavors/template-Exasol-all-python-3.10/flavor_base/packages.yml
+++ b/flavors/template-Exasol-all-python-3.10/flavor_base/packages.yml
@@ -31,6 +31,8 @@ build_steps:
         version: 1.34+dfsg-1ubuntu*
       - name: curl
         version: 7.81.0-1ubuntu*
+      - name: openjdk-11-jdk-headless
+        version: 11.0.32+9-1ubuntu*
       - name: ca-certificates
         version: 20260601~22.04.1
       - name: build-essential
diff --git a/flavors/template-Exasol-all-python-3.12/flavor_base/packages.yml b/flavors/template-Exasol-all-python-3.12/flavor_base/packages.yml
index 6832024..91eeafd 100644
--- a/flavors/template-Exasol-all-python-3.12/flavor_base/packages.yml
+++ b/flavors/template-Exasol-all-python-3.12/flavor_base/packages.yml
@@ -10,6 +10,8 @@ build_steps:
         version: 1.35+dfsg-3ubuntu*
       - name: curl
         version: 8.5.0-2ubuntu*
+      - name: openjdk-17-jdk-headless
+        version: 17.0.20+8-1~24.04
       - name: ca-certificates
         version: '20260601~24.04.1'
       - name: build-essential
diff --git a/test_container/build/Dockerfile b/test_container/build/Dockerfile
index d13dedc..c78747c 100644
--- a/test_container/build/Dockerfile
+++ b/test_container/build/Dockerfile
@@ -5,7 +5,7 @@ COPY deps/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
 
 RUN apt-get -y update && \
     apt-get -y install \
-        openjdk-11-jre-headless \
+        openjdk-17-jre-headless \
         locales \
         python3.10-venv \
         python3-pip \