diff --git a/src/driver/src/main/java/com/edgedb/driver/binary/PacketReader.java b/src/driver/src/main/java/com/edgedb/driver/binary/PacketReader.java
index 123b2fa..7005f24 100644
--- a/src/driver/src/main/java/com/edgedb/driver/binary/PacketReader.java
+++ b/src/driver/src/main/java/com/edgedb/driver/binary/PacketReader.java
@@ -9,7 +9,6 @@ import org.joou.UInteger;
 import org.joou.ULong;
 import org.joou.UShort;
 
-import javax.naming.OperationNotSupportedException;
 import java.lang.reflect.Array;
 import java.nio.charset.StandardCharsets;
 import java.util.EnumSet;
@@ -185,7 +184,7 @@ public class PacketReader {
         var set = EnumSet.noneOf(cls);
 
         for (var enumConstant : cls.getEnumConstants()) {
-            if((value & enumConstant.getValue().longValue()) >= 0) {
+            if((value & enumConstant.getValue().longValue()) > 0) {
                 set.add(enumConstant);
             }
         }
diff --git a/src/driver/src/main/java/com/edgedb/driver/binary/builders/types/TypeBuilder.java b/src/driver/src/main/java/com/edgedb/driver/binary/builders/types/TypeBuilder.java
index 459d3e2..28d3662 100644
--- a/src/driver/src/main/java/com/edgedb/driver/binary/builders/types/TypeBuilder.java
+++ b/src/driver/src/main/java/com/edgedb/driver/binary/builders/types/TypeBuilder.java
@@ -5,6 +5,8 @@ import com.edgedb.driver.binary.codecs.Codec;
 import com.edgedb.driver.binary.codecs.ObjectCodec;
 import com.edgedb.driver.binary.packets.receivable.Data;
 import com.edgedb.driver.clients.EdgeDBBinaryClient;
+import com.edgedb.driver.datatypes.Tuple;
+import com.edgedb.driver.datatypes.internal.TupleImpl;
 import com.edgedb.driver.exceptions.EdgeDBException;
 import org.jetbrains.annotations.Nullable;
 
@@ -21,6 +23,7 @@ public final class TypeBuilder {
         deserializerInfo = new ConcurrentHashMap<>() {{
             put(Map.class, new TypeDeserializerInfo<>(Map.class, (e, v) -> e.flatten()));
             put(Object.class, new TypeDeserializerInfo<>(Object.class, (e, v) -> e.flatten()));
+            put(Tuple.class, new TypeDeserializerInfo<>(TupleImpl.class));
         }};
     }
 
diff --git a/src/driver/src/main/java/com/edgedb/driver/datatypes/Range.java b/src/driver/src/main/java/com/edgedb/driver/datatypes/Range.java
index 35f4bbe..438b293 100644
--- a/src/driver/src/main/java/com/edgedb/driver/datatypes/Range.java
+++ b/src/driver/src/main/java/com/edgedb/driver/datatypes/Range.java
@@ -1,12 +1,14 @@
 package com.edgedb.driver.datatypes;
 
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.math.BigDecimal;
-import java.time.*;
-import java.util.HashMap;
-import java.util.Map;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -14,27 +16,13 @@ import java.util.Objects;
  * @param <T> The inner type of the range.
  * @see <a href="https://www.edgedb.com/docs/stdlib/range">EdgeDB range docs</a>
  */
-public final class Range<T> implements Comparable<Range<T>> {
+public final class Range<T> {
     /**
      * An empty range with no specific inner type.
      */
     public static final Range<?> EMPTY_RANGE = new Range<>(Long.class, null, null);
 
-    private static final Map<Class<?>, ?> DEFAULTS = new HashMap<>(){{
-        put(Integer.class, 0);
-        put(Integer.TYPE, 0);
-        put(Long.class, 0L);
-        put(Long.TYPE, 0L);
-        put(Float.class, 0F);
-        put(Float.TYPE, 0F);
-        put(Double.class, 0D);
-        put(Double.TYPE, 0D);
-        put(BigDecimal.class, BigDecimal.ZERO);
-        put(OffsetDateTime.class, OffsetDateTime.MIN);
-        put(ZonedDateTime.class, OffsetDateTime.MIN.atZoneSameInstant(ZoneOffset.UTC));
-        put(LocalDateTime.class, LocalDateTime.MIN);
-        put(LocalDate.class, LocalDate.MIN);
-    }};
+    private static List<Class<?>> VALID_ELEMENTS;
 
     private final @Nullable T lower;
     private final @Nullable T upper;
@@ -49,9 +37,7 @@ public final class Range<T> implements Comparable<Range<T>> {
     }
 
     private Range(Class<T> cls, @Nullable T lower, @Nullable T upper, boolean includeLower, boolean includeUpper) {
-        if(!DEFAULTS.containsKey(cls)) {
-            throw new IllegalArgumentException("Range element type is invalid");
-        }
+        checkValidElement(cls);
 
         this.lower = lower;
         this.upper = upper;
@@ -61,6 +47,28 @@ public final class Range<T> implements Comparable<Range<T>> {
         this.elementType = cls;
     }
 
+    private synchronized void checkValidElement(Class<?> cls) {
+        var valid = VALID_ELEMENTS == null ? (VALID_ELEMENTS = new ArrayList<>(){{
+            add(Integer.class);
+            add(Integer.TYPE);
+            add(Long.class);
+            add(Long.TYPE);
+            add(Float.class);
+            add(Float.TYPE);
+            add(Double.class);
+            add(Double.TYPE);
+            add(BigDecimal.class);
+            add(OffsetDateTime.class);
+            add(ZonedDateTime.class);
+            add(LocalDateTime.class);
+            add(LocalDate.class);
+        }}) : VALID_ELEMENTS;
+
+        if(!valid.contains(cls)) {
+            throw new IllegalArgumentException("Range element type is invalid");
+        }
+    }
+
     /**
      * Gets the lower bounds of the range.
      * @return The lower bounds if present; otherwise {@code null}.
@@ -161,38 +169,6 @@ public final class Range<T> implements Comparable<Range<T>> {
         return this.elementType;
     }
 
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public int compareTo(@NotNull Range<T> o) {
-        int a = 0;
-        int b = 0;
-
-        if(!isEmpty) {
-            var l = lower == null ? (T)DEFAULTS.get(elementType) : lower;
-            var u = upper == null ? (T)DEFAULTS.get(elementType) : upper;
-
-            if(!(u instanceof Comparable)) {
-                throw new ClassCastException("Unable to compare element values");
-            }
-
-            a = ((Comparable<T>)u).compareTo(l);
-        }
-
-        if(!o.isEmpty) {
-            var l = o.lower == null ? (T)DEFAULTS.get(o.elementType) : o.lower;
-            var u = o.upper == null ? (T)DEFAULTS.get(o.elementType) : o.upper;
-
-            if(!(u instanceof Comparable)) {
-                throw new ClassCastException("Unable to compare element values");
-            }
-
-            b = ((Comparable<T>)u).compareTo(l);
-        }
-
-        return b - a;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/src/driver/src/test/java/shared/SharedTestsRunner.java b/src/driver/src/test/java/shared/SharedTestsRunner.java
index c839df5..4cb77e1 100644
--- a/src/driver/src/test/java/shared/SharedTestsRunner.java
+++ b/src/driver/src/test/java/shared/SharedTestsRunner.java
@@ -65,14 +65,17 @@ public class SharedTestsRunner {
         }
     }
 
-    public static void Run(String path) {
+    public static void Run(Path path) {
+        // we're in './src/driver', so remove 2 levels of the dir
+        var absPath = Path.of(System.getProperty("user.dir")).getParent().getParent().resolve(path);
+
         // since result type combinations are exponential, we set a hard coded limit as to not run out of memory.
         final int maxResultTypes = 15;
 
         Test testDefinition;
 
         try {
-            var content = Files.readString(Path.of(path));
+            var content = Files.readString(absPath);
             testDefinition = MAPPER.readValue(content, Test.class);
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -105,7 +108,7 @@ public class SharedTestsRunner {
             }
         }
 
-        var resultTypes = ResultTypeBuilder.createResultTypes(testDefinition.result, maxResultTypes, !path.contains("deep_nesting"));
+        var resultTypes = ResultTypeBuilder.createResultTypes(testDefinition.result, maxResultTypes, !absPath.toString().contains("deep_nesting"));
 
         for(int i = 0; i != results.size(); i++) {
             var executionResult = results.get(i);
diff --git a/src/driver/src/test/java/shared/generated/V2ArgumentsTests.java b/src/driver/src/test/java/shared/generated/V2ArgumentsTests.java
index 7444f8d..b497b6c 100644
--- a/src/driver/src/test/java/shared/generated/V2ArgumentsTests.java
+++ b/src/driver/src/test/java/shared/generated/V2ArgumentsTests.java
@@ -2,383 +2,384 @@ package shared.generated;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.DisplayName;
 import shared.SharedTestsRunner;
+import java.nio.file.Path;
 public class V2ArgumentsTests {
     @Test
     @DisplayName("Argument of type array<std::bigint>")
     public void v2Arguments_0() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\0.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "0.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bigint")
     public void v2Arguments_1() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\1.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "1.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int16")
     public void v2Arguments_10() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\10.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "10.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int32")
     public void v2Arguments_11() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\11.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "11.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int64")
     public void v2Arguments_12() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\12.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "12.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::json")
     public void v2Arguments_13() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\13.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "13.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_datetime")
     public void v2Arguments_14() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\14.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "14.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_date")
     public void v2Arguments_15() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\15.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "15.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_time")
     public void v2Arguments_16() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\16.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "16.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type range<std::int32>")
     public void v2Arguments_17() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\17.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "17.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::relative_duration")
     public void v2Arguments_18() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\18.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "18.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::str")
     public void v2Arguments_19() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\19.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "19.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bool")
     public void v2Arguments_2() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\2.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "2.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::uuid")
     public void v2Arguments_20() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\20.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "20.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type array<std::bigint>")
     public void v2Arguments_21() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\21.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "21.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bigint")
     public void v2Arguments_22() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\22.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "22.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bool")
     public void v2Arguments_23() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\23.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "23.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bytes")
     public void v2Arguments_24() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\24.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "24.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::date_duration")
     public void v2Arguments_25() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\25.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "25.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::datetime")
     public void v2Arguments_26() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\26.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "26.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::decimal")
     public void v2Arguments_27() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\27.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "27.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::duration")
     public void v2Arguments_28() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\28.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "28.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::float32")
     public void v2Arguments_29() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\29.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "29.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bytes")
     public void v2Arguments_3() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\3.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "3.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::float64")
     public void v2Arguments_30() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\30.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "30.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int16")
     public void v2Arguments_31() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\31.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "31.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int32")
     public void v2Arguments_32() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\32.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "32.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int64")
     public void v2Arguments_33() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\33.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "33.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::json")
     public void v2Arguments_34() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\34.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "34.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_datetime")
     public void v2Arguments_35() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\35.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "35.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_date")
     public void v2Arguments_36() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\36.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "36.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_time")
     public void v2Arguments_37() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\37.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "37.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type range<std::int32>")
     public void v2Arguments_38() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\38.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "38.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::relative_duration")
     public void v2Arguments_39() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\39.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "39.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::date_duration")
     public void v2Arguments_4() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\4.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "4.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::str")
     public void v2Arguments_40() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\40.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "40.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::uuid")
     public void v2Arguments_41() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\41.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "41.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type array<std::bigint>")
     public void v2Arguments_42() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\42.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "42.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bigint")
     public void v2Arguments_43() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\43.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "43.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bool")
     public void v2Arguments_44() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\44.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "44.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bytes")
     public void v2Arguments_45() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\45.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "45.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::date_duration")
     public void v2Arguments_46() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\46.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "46.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::datetime")
     public void v2Arguments_47() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\47.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "47.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::decimal")
     public void v2Arguments_48() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\48.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "48.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::duration")
     public void v2Arguments_49() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\49.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "49.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::datetime")
     public void v2Arguments_5() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\5.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "5.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::float32")
     public void v2Arguments_50() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\50.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "50.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::float64")
     public void v2Arguments_51() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\51.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "51.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int16")
     public void v2Arguments_52() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\52.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "52.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int32")
     public void v2Arguments_53() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\53.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "53.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int64")
     public void v2Arguments_54() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\54.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "54.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::json")
     public void v2Arguments_55() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\55.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "55.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_datetime")
     public void v2Arguments_56() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\56.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "56.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_date")
     public void v2Arguments_57() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\57.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "57.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_time")
     public void v2Arguments_58() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\58.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "58.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type range<std::int32>")
     public void v2Arguments_59() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\59.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "59.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::decimal")
     public void v2Arguments_6() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\6.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "6.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::relative_duration")
     public void v2Arguments_60() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\60.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "60.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::str")
     public void v2Arguments_61() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\61.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "61.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::uuid")
     public void v2Arguments_62() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\62.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "62.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::duration")
     public void v2Arguments_7() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\7.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "7.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::float32")
     public void v2Arguments_8() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\8.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "8.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::float64")
     public void v2Arguments_9() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_arguments\\9.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_arguments", "9.json");
         SharedTestsRunner.Run(path);
     }
 }
diff --git a/src/driver/src/test/java/shared/generated/V2DeepNestingTests.java b/src/driver/src/test/java/shared/generated/V2DeepNestingTests.java
deleted file mode 100644
index 6be6099..0000000
--- a/src/driver/src/test/java/shared/generated/V2DeepNestingTests.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package shared.generated;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.DisplayName;
-import shared.SharedTestsRunner;
-public class V2DeepNestingTests {
-    @Test
-    @DisplayName("Deep query nesting of type array<std::int64>")
-    public void v2DeepNesting_0() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\0.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type cal::local_time")
-    public void v2DeepNesting_1() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\1.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type cal::local_time")
-    public void v2DeepNesting_10() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\10.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>")
-    public void v2DeepNesting_11() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\11.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>")
-    public void v2DeepNesting_12() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\12.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>")
-    public void v2DeepNesting_13() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\13.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>")
-    public void v2DeepNesting_14() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\14.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type range<std::int64>")
-    public void v2DeepNesting_15() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\15.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type set<array<std::int64>>")
-    public void v2DeepNesting_16() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\16.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>")
-    public void v2DeepNesting_17() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\17.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type array<std::int64>")
-    public void v2DeepNesting_18() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\18.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type cal::local_time")
-    public void v2DeepNesting_19() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\19.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type namedtuple<std::int64, cal::local_time, std::str>")
-    public void v2DeepNesting_2() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\2.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>")
-    public void v2DeepNesting_20() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\20.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>")
-    public void v2DeepNesting_21() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\21.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type object<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>")
-    public void v2DeepNesting_22() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\22.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type object<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>")
-    public void v2DeepNesting_23() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\23.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type range<std::int64>")
-    public void v2DeepNesting_24() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\24.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type set<array<std::int64>>")
-    public void v2DeepNesting_25() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\25.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>")
-    public void v2DeepNesting_26() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\26.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type array<std::int64>")
-    public void v2DeepNesting_27() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\27.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type cal::local_time")
-    public void v2DeepNesting_28() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\28.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>>")
-    public void v2DeepNesting_29() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\29.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type namedtuple<std::int64, cal::local_time, std::str>")
-    public void v2DeepNesting_3() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\3.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>>")
-    public void v2DeepNesting_30() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\30.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type object<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>>")
-    public void v2DeepNesting_31() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\31.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type object<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>>")
-    public void v2DeepNesting_32() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\32.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type range<std::int64>")
-    public void v2DeepNesting_33() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\33.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type set<array<std::int64>>")
-    public void v2DeepNesting_34() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\34.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, namedtuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, object<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>, range<std::int64>, set<array<std::int64>>, std::str, tuple<array<std::int64>, std::int64, cal::local_time, namedtuple<std::int64, cal::local_time, std::str>, namedtuple<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, object<std::int64, cal::local_time, std::str>, range<std::int64>, set<std::int64>, std::str, tuple<std::int64, cal::local_time, std::str>>>>")
-    public void v2DeepNesting_35() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\35.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type object<std::int64, cal::local_time, std::str>")
-    public void v2DeepNesting_4() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\4.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type object<std::int64, cal::local_time, std::str>")
-    public void v2DeepNesting_5() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\5.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type range<std::int64>")
-    public void v2DeepNesting_6() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\6.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type set<std::int64>")
-    public void v2DeepNesting_7() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\7.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type tuple<std::int64, cal::local_time, std::str>")
-    public void v2DeepNesting_8() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\8.json";
-        SharedTestsRunner.Run(path);
-    }
-    @Test
-    @DisplayName("Deep query nesting of type array<std::int64>")
-    public void v2DeepNesting_9() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_deep_nesting\\9.json";
-        SharedTestsRunner.Run(path);
-    }
-}
diff --git a/src/driver/src/test/java/shared/generated/V2QueryResultsTests.java b/src/driver/src/test/java/shared/generated/V2QueryResultsTests.java
index 1f928b5..5b1d7b6 100644
--- a/src/driver/src/test/java/shared/generated/V2QueryResultsTests.java
+++ b/src/driver/src/test/java/shared/generated/V2QueryResultsTests.java
@@ -2,809 +2,810 @@ package shared.generated;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.DisplayName;
 import shared.SharedTestsRunner;
+import java.nio.file.Path;
 public class V2QueryResultsTests {
     @Test
     @DisplayName("Query result of type array<cal::local_date>")
     public void v2QueryResults_0() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\0.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "0.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::uuid>")
     public void v2QueryResults_1() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\1.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "1.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::datetime>")
     public void v2QueryResults_10() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\10.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "10.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::json")
     public void v2QueryResults_100() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\100.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "100.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type cal::local_datetime")
     public void v2QueryResults_101() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\101.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "101.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type cal::local_date")
     public void v2QueryResults_102() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\102.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "102.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type cal::local_time")
     public void v2QueryResults_103() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\103.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "103.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<std::uuid>")
     public void v2QueryResults_104() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\104.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "104.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<std::int16, std::bytes, std::float64, cal::date_duration, namedtuple<std::decimal, std::int16>, namedtuple<std::int16, std::decimal>, namedtuple<std::int16, std::decimal>, cal::local_time, array<cal::local_datetime>, array<std::datetime>, array<std::decimal>, array<std::float32>, array<std::uuid>, array<std::uuid>, array<std::float64>, array<std::int64>, array<std::int64>, array<std::int32>, array<std::int16>, array<std::str>, array<cal::local_date>, array<std::json>, array<std::json>, array<std::bytes>, array<cal::relative_duration>>")
     public void v2QueryResults_105() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\105.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "105.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<std::bytes, std::float64, cal::date_duration, namedtuple<std::uuid, std::bytes, std::decimal>, namedtuple<std::uuid, std::bytes, std::decimal>, namedtuple<std::bytes, std::decimal, std::uuid>, namedtuple<std::decimal, std::uuid, std::bytes>, namedtuple<std::uuid, std::bytes, std::decimal>, cal::local_time, array<cal::relative_duration>, array<std::float64>, array<std::float64>, array<std::json>, array<std::bool>, array<cal::local_time>, array<cal::local_time>, array<std::int64>, array<cal::date_duration>, array<cal::local_date>, array<std::str>, array<std::bytes>, array<std::datetime>, array<std::duration>, std::int16>")
     public void v2QueryResults_106() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\106.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "106.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<std::float64, cal::date_duration, namedtuple<cal::relative_duration>, namedtuple<cal::relative_duration>, namedtuple<cal::relative_duration>, cal::local_time, array<std::bytes>, array<std::json>, array<std::int16>, array<std::float64>, array<std::str>, array<std::str>, array<std::int32>, array<cal::local_datetime>, array<std::decimal>, array<std::bigint>, array<cal::local_date>, std::int16, std::bytes>")
     public void v2QueryResults_107() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\107.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "107.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<cal::date_duration, namedtuple<std::bool, cal::local_datetime, std::decimal, std::float32, std::int16, std::float64, cal::local_date>, namedtuple<cal::local_datetime, std::decimal, std::float32, std::int16, std::float64, cal::local_date, std::bool>, namedtuple<std::decimal, std::float32, std::int16, std::float64, cal::local_date, std::bool, cal::local_datetime>, namedtuple<std::float32, std::int16, std::float64, cal::local_date, std::bool, cal::local_datetime, std::decimal>, namedtuple<std::int16, std::float64, cal::local_date, std::bool, cal::local_datetime, std::decimal, std::float32>, namedtuple<std::int16, std::float64, cal::local_date, std::bool, cal::local_datetime, std::decimal, std::float32>, namedtuple<std::float64, cal::local_date, std::bool, cal::local_datetime, std::decimal, std::float32, std::int16>, namedtuple<cal::local_date, std::bool, cal::local_datetime, std::decimal, std::float32, std::int16, std::float64>, cal::local_time, array<std::json>, array<std::int16>, array<std::bytes>, array<std::bytes>, array<std::decimal>, array<std::float64>, array<std::datetime>, array<cal::local_datetime>, array<std::duration>, array<std::duration>, array<std::duration>, array<cal::date_duration>, std::int16, std::bytes, std::float64>")
     public void v2QueryResults_108() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\108.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "108.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<namedtuple<std::bigint, std::int32, cal::local_time, std::json, cal::relative_duration>, namedtuple<std::int32, cal::local_time, std::json, cal::relative_duration, std::bigint>, namedtuple<cal::local_time, std::json, cal::relative_duration, std::bigint, std::int32>, namedtuple<cal::local_time, std::json, cal::relative_duration, std::bigint, std::int32>, namedtuple<cal::local_time, std::json, cal::relative_duration, std::bigint, std::int32>, namedtuple<std::json, cal::relative_duration, std::bigint, std::int32, cal::local_time>, namedtuple<std::json, cal::relative_duration, std::bigint, std::int32, cal::local_time>, namedtuple<cal::relative_duration, std::bigint, std::int32, cal::local_time, std::json>, cal::local_time, array<std::float64>, array<std::str>, array<std::str>, array<std::bigint>, array<cal::local_date>, std::int16, std::bytes, std::float64, cal::date_duration>")
     public void v2QueryResults_109() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\109.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "109.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::int64>")
     public void v2QueryResults_11() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\11.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "11.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<cal::local_time, array<std::json>, array<std::decimal>, array<cal::local_datetime>, array<std::bigint>, array<std::bool>, array<std::float64>, array<std::int64>, array<std::int64>, array<cal::date_duration>, array<cal::date_duration>, array<std::uuid>, array<cal::relative_duration>, array<cal::local_date>, array<cal::local_date>, array<std::datetime>, array<std::datetime>, array<std::str>, array<std::int32>, array<std::float32>, std::int16, std::bytes, std::float64, cal::date_duration>")
     public void v2QueryResults_110() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\110.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "110.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<array<std::str>, array<std::float64>, array<std::int32>, array<std::decimal>, array<cal::local_time>, array<cal::local_time>, std::int16, std::bytes, std::float64, cal::date_duration, namedtuple<std::decimal, std::float64, std::bigint, std::json>, namedtuple<std::float64, std::bigint, std::json, std::decimal>, namedtuple<std::bigint, std::json, std::decimal, std::float64>, namedtuple<std::json, std::decimal, std::float64, std::bigint>, namedtuple<std::decimal, std::float64, std::bigint, std::json>, cal::local_time>")
     public void v2QueryResults_111() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\111.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "111.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type object<std::str>")
     public void v2QueryResults_112() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\112.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "112.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type object<std::datetime, std::uuid, cal::local_date>")
     public void v2QueryResults_113() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\113.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "113.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type object<std::uuid, cal::local_date, std::datetime>")
     public void v2QueryResults_114() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\114.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "114.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type object<cal::local_date, std::datetime, std::uuid>")
     public void v2QueryResults_115() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\115.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "115.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type range<cal::local_date>")
     public void v2QueryResults_116() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\116.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "116.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type range<std::int32>")
     public void v2QueryResults_117() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\117.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "117.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type cal::relative_duration")
     public void v2QueryResults_118() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\118.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "118.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<std::int16>")
     public void v2QueryResults_119() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\119.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "119.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::bool>")
     public void v2QueryResults_12() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\12.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "12.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<cal::relative_duration>")
     public void v2QueryResults_120() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\120.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "120.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<range<std::int64>>")
     public void v2QueryResults_121() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\121.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "121.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<std::bigint>")
     public void v2QueryResults_122() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\122.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "122.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<cal::local_datetime>")
     public void v2QueryResults_123() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\123.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "123.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<std::uuid>")
     public void v2QueryResults_124() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\124.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "124.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<cal::date_duration>")
     public void v2QueryResults_125() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\125.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "125.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<set<std::datetime>>")
     public void v2QueryResults_126() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\126.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "126.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<std::str>")
     public void v2QueryResults_127() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\127.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "127.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<std::bool>")
     public void v2QueryResults_128() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\128.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "128.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<std::json>")
     public void v2QueryResults_129() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\129.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "129.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::bool>")
     public void v2QueryResults_13() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\13.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "13.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::str")
     public void v2QueryResults_130() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\130.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "130.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type tuple<cal::local_datetime, std::json>")
     public void v2QueryResults_131() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\131.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "131.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type tuple<std::json, cal::local_datetime>")
     public void v2QueryResults_132() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\132.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "132.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::uuid")
     public void v2QueryResults_133() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\133.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "133.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<cal::relative_duration>")
     public void v2QueryResults_14() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\14.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "14.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::bigint")
     public void v2QueryResults_15() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\15.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "15.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::bool")
     public void v2QueryResults_16() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\16.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "16.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::bytes")
     public void v2QueryResults_17() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\17.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "17.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type cal::date_duration")
     public void v2QueryResults_18() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\18.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "18.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::datetime")
     public void v2QueryResults_19() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\19.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "19.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<cal::date_duration>")
     public void v2QueryResults_2() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\2.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "2.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::decimal")
     public void v2QueryResults_20() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\20.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "20.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::duration")
     public void v2QueryResults_21() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\21.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "21.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::float32")
     public void v2QueryResults_22() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\22.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "22.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::float64")
     public void v2QueryResults_23() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\23.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "23.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::int16")
     public void v2QueryResults_24() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\24.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "24.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::int32")
     public void v2QueryResults_25() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\25.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "25.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::int64")
     public void v2QueryResults_26() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\26.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "26.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::json")
     public void v2QueryResults_27() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\27.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "27.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type cal::local_datetime")
     public void v2QueryResults_28() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\28.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "28.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type cal::local_date")
     public void v2QueryResults_29() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\29.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "29.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::float64>")
     public void v2QueryResults_3() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\3.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "3.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type cal::local_time")
     public void v2QueryResults_30() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\30.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "30.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<std::int32, cal::date_duration, std::datetime, std::str>")
     public void v2QueryResults_31() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\31.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "31.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<cal::date_duration, std::datetime, std::str, std::int32>")
     public void v2QueryResults_32() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\32.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "32.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<std::datetime, std::str, std::int32, cal::date_duration>")
     public void v2QueryResults_33() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\33.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "33.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<std::datetime, std::str, std::int32, cal::date_duration>")
     public void v2QueryResults_34() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\34.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "34.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<std::datetime, std::str, std::int32, cal::date_duration>")
     public void v2QueryResults_35() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\35.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "35.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<std::str, std::int32, cal::date_duration, std::datetime>")
     public void v2QueryResults_36() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\36.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "36.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<std::int32, cal::date_duration, std::datetime, std::str>")
     public void v2QueryResults_37() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\37.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "37.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<std::int32, cal::relative_duration, std::json, std::bigint, std::float32>")
     public void v2QueryResults_38() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\38.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "38.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<cal::relative_duration, std::json, std::bigint, std::float32, std::int32>")
     public void v2QueryResults_39() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\39.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "39.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::int16>")
     public void v2QueryResults_4() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\4.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "4.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<std::json, std::bigint, std::float32, std::int32, cal::relative_duration>")
     public void v2QueryResults_40() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\40.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "40.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<std::json, std::bigint, std::float32, std::int32, cal::relative_duration>")
     public void v2QueryResults_41() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\41.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "41.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<std::bigint, std::float32, std::int32, cal::relative_duration, std::json>")
     public void v2QueryResults_42() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\42.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "42.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type namedtuple<std::float32, std::int32, cal::relative_duration, std::json, std::bigint>")
     public void v2QueryResults_43() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\43.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "43.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type object<std::int32, std::str, cal::local_datetime, std::bool, std::decimal, std::bigint>")
     public void v2QueryResults_44() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\44.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "44.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type object<std::str, cal::local_datetime, std::bool, std::decimal, std::bigint, std::int32>")
     public void v2QueryResults_45() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\45.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "45.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type object<cal::local_datetime, std::bool, std::decimal, std::bigint, std::int32, std::str>")
     public void v2QueryResults_46() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\46.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "46.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type object<std::bool, std::decimal, std::bigint, std::int32, std::str, cal::local_datetime>")
     public void v2QueryResults_47() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\47.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "47.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type object<std::bool, std::decimal, std::bigint, std::int32, std::str, cal::local_datetime>")
     public void v2QueryResults_48() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\48.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "48.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type object<std::decimal, std::bigint, std::int32, std::str, cal::local_datetime, std::bool>")
     public void v2QueryResults_49() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\49.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "49.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::duration>")
     public void v2QueryResults_5() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\5.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "5.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type object<std::bigint, std::int32, std::str, cal::local_datetime, std::bool, std::decimal>")
     public void v2QueryResults_50() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\50.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "50.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type range<std::int32>")
     public void v2QueryResults_51() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\51.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "51.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type range<std::int64>")
     public void v2QueryResults_52() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\52.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "52.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type range<std::float32>")
     public void v2QueryResults_53() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\53.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "53.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type range<std::float64>")
     public void v2QueryResults_54() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\54.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "54.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type range<std::decimal>")
     public void v2QueryResults_55() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\55.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "55.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type range<std::datetime>")
     public void v2QueryResults_56() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\56.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "56.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type range<cal::local_datetime>")
     public void v2QueryResults_57() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\57.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "57.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type range<cal::local_date>")
     public void v2QueryResults_58() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\58.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "58.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type cal::relative_duration")
     public void v2QueryResults_59() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\59.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "59.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::duration>")
     public void v2QueryResults_6() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\6.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "6.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<cal::local_time>")
     public void v2QueryResults_60() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\60.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "60.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<cal::date_duration>")
     public void v2QueryResults_61() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\61.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "61.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<cal::date_duration>")
     public void v2QueryResults_62() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\62.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "62.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<cal::date_duration>")
     public void v2QueryResults_63() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\63.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "63.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<std::int16>")
     public void v2QueryResults_64() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\64.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "64.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<std::int32>")
     public void v2QueryResults_65() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\65.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "65.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<std::json>")
     public void v2QueryResults_66() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\66.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "66.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<std::bool>")
     public void v2QueryResults_67() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\67.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "67.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<std::bool>")
     public void v2QueryResults_68() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\68.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "68.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<std::uuid>")
     public void v2QueryResults_69() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\69.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "69.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::int32>")
     public void v2QueryResults_7() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\7.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "7.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<cal::local_date>")
     public void v2QueryResults_70() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\70.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "70.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<cal::local_date>")
     public void v2QueryResults_71() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\71.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "71.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type set<cal::local_date>")
     public void v2QueryResults_72() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\72.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "72.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::str")
     public void v2QueryResults_73() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\73.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "73.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type tuple<cal::local_time, std::duration>")
     public void v2QueryResults_74() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\74.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "74.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type tuple<cal::local_time, std::duration>")
     public void v2QueryResults_75() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\75.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "75.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type tuple<std::duration, cal::local_time>")
     public void v2QueryResults_76() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\76.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "76.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type tuple<std::duration, cal::local_time>")
     public void v2QueryResults_77() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\77.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "77.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::uuid")
     public void v2QueryResults_78() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\78.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "78.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<range<std::int32>>")
     public void v2QueryResults_79() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\79.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "79.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::json>")
     public void v2QueryResults_8() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\8.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "8.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::str>")
     public void v2QueryResults_80() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\80.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "80.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::int16>")
     public void v2QueryResults_81() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\81.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "81.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::int64>")
     public void v2QueryResults_82() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\82.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "82.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<tuple<std::float32, cal::local_time, std::json, std::str, std::uuid, std::int64, std::duration, std::float64>>")
     public void v2QueryResults_83() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\83.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "83.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::float64>")
     public void v2QueryResults_84() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\84.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "84.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<cal::date_duration>")
     public void v2QueryResults_85() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\85.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "85.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<namedtuple<std::datetime, std::duration, std::str, cal::date_duration, std::uuid, std::float32>>")
     public void v2QueryResults_86() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\86.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "86.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::datetime>")
     public void v2QueryResults_87() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\87.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "87.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::bigint")
     public void v2QueryResults_88() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\88.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "88.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::bool")
     public void v2QueryResults_89() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\89.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "89.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type array<std::bytes>")
     public void v2QueryResults_9() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\9.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "9.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::bytes")
     public void v2QueryResults_90() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\90.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "90.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type cal::date_duration")
     public void v2QueryResults_91() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\91.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "91.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::datetime")
     public void v2QueryResults_92() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\92.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "92.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::decimal")
     public void v2QueryResults_93() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\93.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "93.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::duration")
     public void v2QueryResults_94() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\94.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "94.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::float32")
     public void v2QueryResults_95() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\95.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "95.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::float64")
     public void v2QueryResults_96() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\96.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "96.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::int16")
     public void v2QueryResults_97() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\97.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "97.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::int32")
     public void v2QueryResults_98() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\98.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "98.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Query result of type std::int64")
     public void v2QueryResults_99() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_query_results\\99.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_query_results", "99.json");
         SharedTestsRunner.Run(path);
     }
 }
diff --git a/src/driver/src/test/java/shared/generated/V2StateTests.java b/src/driver/src/test/java/shared/generated/V2StateTests.java
index a243280..b804488 100644
--- a/src/driver/src/test/java/shared/generated/V2StateTests.java
+++ b/src/driver/src/test/java/shared/generated/V2StateTests.java
@@ -2,383 +2,384 @@ package shared.generated;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.DisplayName;
 import shared.SharedTestsRunner;
+import java.nio.file.Path;
 public class V2StateTests {
     @Test
     @DisplayName("Global of type array<std::bigint>")
     public void v2State_0() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\0.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "0.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::bigint")
     public void v2State_1() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\1.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "1.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::int16")
     public void v2State_10() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\10.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "10.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::int32")
     public void v2State_11() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\11.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "11.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::int64")
     public void v2State_12() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\12.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "12.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::json")
     public void v2State_13() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\13.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "13.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type cal::local_datetime")
     public void v2State_14() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\14.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "14.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type cal::local_date")
     public void v2State_15() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\15.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "15.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type cal::local_time")
     public void v2State_16() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\16.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "16.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type range<std::int32>")
     public void v2State_17() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\17.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "17.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type cal::relative_duration")
     public void v2State_18() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\18.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "18.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::str")
     public void v2State_19() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\19.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "19.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::bool")
     public void v2State_2() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\2.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "2.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::uuid")
     public void v2State_20() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\20.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "20.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type array<std::bigint>")
     public void v2State_21() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\21.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "21.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::bigint")
     public void v2State_22() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\22.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "22.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::bool")
     public void v2State_23() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\23.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "23.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::bytes")
     public void v2State_24() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\24.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "24.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type cal::date_duration")
     public void v2State_25() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\25.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "25.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::datetime")
     public void v2State_26() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\26.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "26.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::decimal")
     public void v2State_27() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\27.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "27.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::duration")
     public void v2State_28() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\28.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "28.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::float32")
     public void v2State_29() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\29.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "29.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::bytes")
     public void v2State_3() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\3.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "3.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::float64")
     public void v2State_30() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\30.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "30.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::int16")
     public void v2State_31() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\31.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "31.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::int32")
     public void v2State_32() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\32.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "32.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::int64")
     public void v2State_33() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\33.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "33.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::json")
     public void v2State_34() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\34.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "34.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type cal::local_datetime")
     public void v2State_35() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\35.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "35.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type cal::local_date")
     public void v2State_36() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\36.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "36.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type cal::local_time")
     public void v2State_37() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\37.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "37.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type range<std::int32>")
     public void v2State_38() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\38.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "38.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type cal::relative_duration")
     public void v2State_39() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\39.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "39.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type cal::date_duration")
     public void v2State_4() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\4.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "4.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::str")
     public void v2State_40() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\40.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "40.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::uuid")
     public void v2State_41() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\41.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "41.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type array<std::bigint>")
     public void v2State_42() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\42.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "42.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::bigint")
     public void v2State_43() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\43.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "43.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::bool")
     public void v2State_44() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\44.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "44.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::bytes")
     public void v2State_45() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\45.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "45.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type cal::date_duration")
     public void v2State_46() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\46.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "46.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::datetime")
     public void v2State_47() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\47.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "47.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::decimal")
     public void v2State_48() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\48.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "48.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::duration")
     public void v2State_49() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\49.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "49.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::datetime")
     public void v2State_5() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\5.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "5.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::float32")
     public void v2State_50() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\50.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "50.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::float64")
     public void v2State_51() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\51.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "51.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::int16")
     public void v2State_52() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\52.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "52.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::int32")
     public void v2State_53() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\53.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "53.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::int64")
     public void v2State_54() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\54.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "54.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::json")
     public void v2State_55() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\55.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "55.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type cal::local_datetime")
     public void v2State_56() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\56.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "56.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type cal::local_date")
     public void v2State_57() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\57.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "57.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type cal::local_time")
     public void v2State_58() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\58.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "58.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type range<std::int32>")
     public void v2State_59() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\59.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "59.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::decimal")
     public void v2State_6() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\6.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "6.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type cal::relative_duration")
     public void v2State_60() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\60.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "60.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::str")
     public void v2State_61() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\61.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "61.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::uuid")
     public void v2State_62() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\62.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "62.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::duration")
     public void v2State_7() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\7.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "7.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::float32")
     public void v2State_8() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\8.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "8.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Global of type std::float64")
     public void v2State_9() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v2_state\\9.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v2_state", "9.json");
         SharedTestsRunner.Run(path);
     }
 }
diff --git a/src/driver/src/test/java/shared/generated/V3ArgumentsTests.java b/src/driver/src/test/java/shared/generated/V3ArgumentsTests.java
index d19caef..5adf7dd 100644
--- a/src/driver/src/test/java/shared/generated/V3ArgumentsTests.java
+++ b/src/driver/src/test/java/shared/generated/V3ArgumentsTests.java
@@ -2,533 +2,534 @@ package shared.generated;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.DisplayName;
 import shared.SharedTestsRunner;
+import java.nio.file.Path;
 public class V3ArgumentsTests {
     @Test
     @DisplayName("Argument of type array<std::bigint>")
     public void v3Arguments_0() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\0.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "0.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bigint")
     public void v3Arguments_1() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\1.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "1.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int16")
     public void v3Arguments_10() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\10.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "10.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int32")
     public void v3Arguments_11() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\11.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "11.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int64")
     public void v3Arguments_12() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\12.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "12.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::json")
     public void v3Arguments_13() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\13.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "13.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_datetime")
     public void v3Arguments_14() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\14.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "14.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_date")
     public void v3Arguments_15() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\15.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "15.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_time")
     public void v3Arguments_16() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\16.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "16.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type range<std::int32>")
     public void v3Arguments_17() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\17.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "17.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::relative_duration")
     public void v3Arguments_18() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\18.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "18.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::str")
     public void v3Arguments_19() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\19.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "19.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bool")
     public void v3Arguments_2() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\2.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "2.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>")
     public void v3Arguments_20() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\20.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "20.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::uuid")
     public void v3Arguments_21() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\21.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "21.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type array<std::bigint>")
     public void v3Arguments_22() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\22.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "22.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bigint")
     public void v3Arguments_23() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\23.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "23.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bool")
     public void v3Arguments_24() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\24.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "24.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bytes")
     public void v3Arguments_25() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\25.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "25.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::date_duration")
     public void v3Arguments_26() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\26.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "26.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::datetime")
     public void v3Arguments_27() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\27.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "27.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::decimal")
     public void v3Arguments_28() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\28.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "28.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::duration")
     public void v3Arguments_29() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\29.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "29.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bytes")
     public void v3Arguments_3() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\3.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "3.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::float32")
     public void v3Arguments_30() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\30.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "30.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::float64")
     public void v3Arguments_31() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\31.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "31.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int16")
     public void v3Arguments_32() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\32.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "32.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int32")
     public void v3Arguments_33() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\33.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "33.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int64")
     public void v3Arguments_34() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\34.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "34.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::json")
     public void v3Arguments_35() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\35.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "35.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_datetime")
     public void v3Arguments_36() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\36.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "36.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_date")
     public void v3Arguments_37() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\37.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "37.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_time")
     public void v3Arguments_38() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\38.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "38.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type range<std::int32>")
     public void v3Arguments_39() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\39.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "39.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::date_duration")
     public void v3Arguments_4() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\4.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "4.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::relative_duration")
     public void v3Arguments_40() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\40.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "40.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::str")
     public void v3Arguments_41() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\41.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "41.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>, std::uuid>")
     public void v3Arguments_42() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\42.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "42.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::uuid")
     public void v3Arguments_43() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\43.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "43.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type array<std::bigint>")
     public void v3Arguments_44() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\44.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "44.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bigint")
     public void v3Arguments_45() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\45.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "45.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bool")
     public void v3Arguments_46() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\46.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "46.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bytes")
     public void v3Arguments_47() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\47.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "47.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::date_duration")
     public void v3Arguments_48() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\48.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "48.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::datetime")
     public void v3Arguments_49() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\49.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "49.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::datetime")
     public void v3Arguments_5() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\5.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "5.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::decimal")
     public void v3Arguments_50() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\50.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "50.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::duration")
     public void v3Arguments_51() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\51.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "51.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::float32")
     public void v3Arguments_52() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\52.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "52.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::float64")
     public void v3Arguments_53() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\53.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "53.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int16")
     public void v3Arguments_54() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\54.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "54.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int32")
     public void v3Arguments_55() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\55.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "55.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int64")
     public void v3Arguments_56() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\56.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "56.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::json")
     public void v3Arguments_57() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\57.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "57.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_datetime")
     public void v3Arguments_58() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\58.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "58.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_date")
     public void v3Arguments_59() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\59.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "59.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::decimal")
     public void v3Arguments_6() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\6.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "6.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_time")
     public void v3Arguments_60() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\60.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "60.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type range<std::int32>")
     public void v3Arguments_61() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\61.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "61.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::relative_duration")
     public void v3Arguments_62() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\62.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "62.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::str")
     public void v3Arguments_63() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\63.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "63.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>, std::uuid>, std::uuid>")
     public void v3Arguments_64() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\64.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "64.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::uuid")
     public void v3Arguments_65() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\65.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "65.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type array<std::bigint>")
     public void v3Arguments_66() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\66.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "66.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bigint")
     public void v3Arguments_67() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\67.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "67.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bool")
     public void v3Arguments_68() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\68.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "68.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::bytes")
     public void v3Arguments_69() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\69.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "69.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::duration")
     public void v3Arguments_7() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\7.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "7.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::date_duration")
     public void v3Arguments_70() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\70.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "70.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::datetime")
     public void v3Arguments_71() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\71.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "71.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::decimal")
     public void v3Arguments_72() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\72.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "72.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::duration")
     public void v3Arguments_73() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\73.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "73.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::float32")
     public void v3Arguments_74() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\74.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "74.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::float64")
     public void v3Arguments_75() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\75.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "75.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int16")
     public void v3Arguments_76() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\76.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "76.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int32")
     public void v3Arguments_77() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\77.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "77.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::int64")
     public void v3Arguments_78() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\78.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "78.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::json")
     public void v3Arguments_79() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\79.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "79.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::float32")
     public void v3Arguments_8() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\8.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "8.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_datetime")
     public void v3Arguments_80() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\80.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "80.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_date")
     public void v3Arguments_81() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\81.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "81.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::local_time")
     public void v3Arguments_82() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\82.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "82.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type range<std::int32>")
     public void v3Arguments_83() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\83.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "83.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type cal::relative_duration")
     public void v3Arguments_84() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\84.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "84.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::str")
     public void v3Arguments_85() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\85.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "85.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>, std::uuid>, std::uuid>, std::uuid>")
     public void v3Arguments_86() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\86.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "86.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::uuid")
     public void v3Arguments_87() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\87.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "87.json");
         SharedTestsRunner.Run(path);
     }
     @Test
     @DisplayName("Argument of type std::float64")
     public void v3Arguments_9() {
-        var path = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests\\v3_arguments\\9.json";
+        var path = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs", "v3_arguments", "9.json");
         SharedTestsRunner.Run(path);
     }
 }
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments.json b/src/driver/src/test/java/shared/testdefs/v2_arguments.json
new file mode 100644
index 0000000..e78a698
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments.json
@@ -0,0 +1,4 @@
+{
+  "protocol_version": "1.0",
+  "name": "V2 Arguments"
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/0.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/0.json
new file mode 100644
index 0000000..9d07493
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/0.json
@@ -0,0 +1,156 @@
+{
+  "name": "Argument of type array<std::bigint>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <array<std::bigint>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "array<std::bigint>",
+          "value": {
+            "type": "array",
+            "value": [
+              {
+                "type": "std::bigint",
+                "value": 1683471060357585966953401719466952
+              },
+              {
+                "type": "std::bigint",
+                "value": 1078594995
+              },
+              {
+                "type": "std::bigint",
+                "value": 4978808705160117705035637
+              },
+              {
+                "type": "std::bigint",
+                "value": -21032931613428405
+              },
+              {
+                "type": "std::bigint",
+                "value": 18685293397537
+              },
+              {
+                "type": "std::bigint",
+                "value": -82964411835772
+              },
+              {
+                "type": "std::bigint",
+                "value": 2016575164419795661550157035622
+              },
+              {
+                "type": "std::bigint",
+                "value": -2196457375204816284485
+              },
+              {
+                "type": "std::bigint",
+                "value": 1004899331322766491501
+              },
+              {
+                "type": "std::bigint",
+                "value": 478414862298742379683662
+              },
+              {
+                "type": "std::bigint",
+                "value": -1890903747444990898922095670397045
+              },
+              {
+                "type": "std::bigint",
+                "value": -4810849241313362122
+              },
+              {
+                "type": "std::bigint",
+                "value": 406762244173595159973148
+              },
+              {
+                "type": "std::bigint",
+                "value": -72470202616
+              },
+              {
+                "type": "std::bigint",
+                "value": -680306557
+              }
+            ],
+            "element_type": "std::bigint"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::bigint",
+          "value": 1683471060357585966953401719466952
+        },
+        {
+          "type": "std::bigint",
+          "value": 1078594995
+        },
+        {
+          "type": "std::bigint",
+          "value": 4978808705160117705035637
+        },
+        {
+          "type": "std::bigint",
+          "value": -21032931613428405
+        },
+        {
+          "type": "std::bigint",
+          "value": 18685293397537
+        },
+        {
+          "type": "std::bigint",
+          "value": -82964411835772
+        },
+        {
+          "type": "std::bigint",
+          "value": 2016575164419795661550157035622
+        },
+        {
+          "type": "std::bigint",
+          "value": -2196457375204816284485
+        },
+        {
+          "type": "std::bigint",
+          "value": 1004899331322766491501
+        },
+        {
+          "type": "std::bigint",
+          "value": 478414862298742379683662
+        },
+        {
+          "type": "std::bigint",
+          "value": -1890903747444990898922095670397045
+        },
+        {
+          "type": "std::bigint",
+          "value": -4810849241313362122
+        },
+        {
+          "type": "std::bigint",
+          "value": 406762244173595159973148
+        },
+        {
+          "type": "std::bigint",
+          "value": -72470202616
+        },
+        {
+          "type": "std::bigint",
+          "value": -680306557
+        }
+      ],
+      "element_type": "std::bigint"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/1.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/1.json
new file mode 100644
index 0000000..185da76
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/1.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bigint",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bigint>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bigint",
+          "value": {
+            "type": "std::bigint",
+            "value": 817110136258735961472
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bigint",
+      "value": 817110136258735961472
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/10.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/10.json
new file mode 100644
index 0000000..2706a19
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/10.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int16",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int16>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int16",
+          "value": {
+            "type": "std::int16",
+            "value": 13776
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int16",
+      "value": 13776
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/11.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/11.json
new file mode 100644
index 0000000..377d554
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/11.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int32>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int32",
+          "value": {
+            "type": "std::int32",
+            "value": 2093652717
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int32",
+      "value": 2093652717
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/12.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/12.json
new file mode 100644
index 0000000..6ebb65f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/12.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int64>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int64",
+          "value": {
+            "type": "std::int64",
+            "value": 2353570371465927195
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int64",
+      "value": 2353570371465927195
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/13.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/13.json
new file mode 100644
index 0000000..21bf0ec
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/13.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::json",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::json>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::json",
+          "value": {
+            "type": "std::json",
+            "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::json",
+      "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/14.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/14.json
new file mode 100644
index 0000000..3f0682e
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/14.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_datetime>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_datetime",
+          "value": {
+            "type": "cal::local_datetime",
+            "value": "1323-07-08T12:47:24.1641960"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_datetime",
+      "value": "1323-07-08T12:47:24.1641960"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/15.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/15.json
new file mode 100644
index 0000000..bed3525
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/15.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_date",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_date>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_date",
+          "value": {
+            "type": "cal::local_date",
+            "value": "8972-08-19"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_date",
+      "value": "8972-08-19"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/16.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/16.json
new file mode 100644
index 0000000..91e1239
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/16.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_time",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_time>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_time",
+          "value": {
+            "type": "cal::local_time",
+            "value": "01:38:09.3240860"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_time",
+      "value": "01:38:09.3240860"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/17.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/17.json
new file mode 100644
index 0000000..7376154
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/17.json
@@ -0,0 +1,44 @@
+{
+  "name": "Argument of type range<std::int32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <range<std::int32>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "range<std::int32>",
+          "value": {
+            "type": "range",
+            "value": {
+              "lower": 1895996110,
+              "upper": 2129760585,
+              "inc_lower": true,
+              "inc_upper": false
+            },
+            "element_type": "std::int32"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": 1895996110,
+        "upper": 2129760585,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::int32"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/18.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/18.json
new file mode 100644
index 0000000..785661f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/18.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::relative_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::relative_duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::relative_duration",
+          "value": {
+            "type": "cal::relative_duration",
+            "value": "3.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::relative_duration",
+      "value": "3.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/19.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/19.json
new file mode 100644
index 0000000..8cc1895
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/19.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::str",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::str>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::str",
+          "value": {
+            "type": "std::str",
+            "value": "DFMPGIGUDPORIAC"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::str",
+      "value": "DFMPGIGUDPORIAC"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/2.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/2.json
new file mode 100644
index 0000000..38d3469
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/2.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bool",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bool>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bool",
+          "value": {
+            "type": "std::bool",
+            "value": true
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bool",
+      "value": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/20.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/20.json
new file mode 100644
index 0000000..7a7a3b3
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/20.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::uuid",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::uuid>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::uuid",
+          "value": {
+            "type": "std::uuid",
+            "value": "43b96bbf-c4e2-e40a-7645-2d4ee30c85f7"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::uuid",
+      "value": "43b96bbf-c4e2-e40a-7645-2d4ee30c85f7"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/21.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/21.json
new file mode 100644
index 0000000..109aea2
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/21.json
@@ -0,0 +1,76 @@
+{
+  "name": "Argument of type array<std::bigint>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <array<std::bigint>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "array<std::bigint>",
+          "value": {
+            "type": "array",
+            "value": [
+              {
+                "type": "std::bigint",
+                "value": -8871450174295129639247539338652
+              },
+              {
+                "type": "std::bigint",
+                "value": 8673763119370837592258308958166
+              },
+              {
+                "type": "std::bigint",
+                "value": 23035637814
+              },
+              {
+                "type": "std::bigint",
+                "value": 111033547948288444798
+              },
+              {
+                "type": "std::bigint",
+                "value": -615449420902506675473
+              }
+            ],
+            "element_type": "std::bigint"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::bigint",
+          "value": -8871450174295129639247539338652
+        },
+        {
+          "type": "std::bigint",
+          "value": 8673763119370837592258308958166
+        },
+        {
+          "type": "std::bigint",
+          "value": 23035637814
+        },
+        {
+          "type": "std::bigint",
+          "value": 111033547948288444798
+        },
+        {
+          "type": "std::bigint",
+          "value": -615449420902506675473
+        }
+      ],
+      "element_type": "std::bigint"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/22.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/22.json
new file mode 100644
index 0000000..a1bdb2a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/22.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bigint",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bigint>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bigint",
+          "value": {
+            "type": "std::bigint",
+            "value": 1902997020411467665810
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bigint",
+      "value": 1902997020411467665810
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/23.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/23.json
new file mode 100644
index 0000000..38d3469
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/23.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bool",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bool>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bool",
+          "value": {
+            "type": "std::bool",
+            "value": true
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bool",
+      "value": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/24.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/24.json
new file mode 100644
index 0000000..cd27a41
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/24.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bytes",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bytes>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bytes",
+          "value": {
+            "type": "std::bytes",
+            "value": "NTRUOUg5NTdRNU1U"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bytes",
+      "value": "NTRUOUg5NTdRNU1U"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/25.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/25.json
new file mode 100644
index 0000000..cb66c3b
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/25.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::date_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::date_duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::date_duration",
+          "value": {
+            "type": "cal::date_duration",
+            "value": "-9970.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::date_duration",
+      "value": "-9970.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/26.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/26.json
new file mode 100644
index 0000000..e4f9911
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/26.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::datetime>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::datetime",
+          "value": {
+            "type": "std::datetime",
+            "value": "3910-05-11T13:53:58.77048-03:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::datetime",
+      "value": "3910-05-11T13:53:58.77048-03:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/27.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/27.json
new file mode 100644
index 0000000..4c6583b
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/27.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::decimal",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::decimal>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::decimal",
+          "value": {
+            "type": "std::decimal",
+            "value": 27.838213100954058
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::decimal",
+      "value": 27.838213100954058
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/28.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/28.json
new file mode 100644
index 0000000..41b3033
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/28.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::duration",
+          "value": {
+            "type": "std::duration",
+            "value": "300.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::duration",
+      "value": "300.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/29.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/29.json
new file mode 100644
index 0000000..f02e0ee
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/29.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::float32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::float32>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::float32",
+          "value": {
+            "type": "std::float32",
+            "value": 84.81177
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float32",
+      "value": 84.81177
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/3.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/3.json
new file mode 100644
index 0000000..97c70e8
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/3.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bytes",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bytes>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bytes",
+          "value": {
+            "type": "std::bytes",
+            "value": "Q1FSSENJRlFRQU40SA=="
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bytes",
+      "value": "Q1FSSENJRlFRQU40SA=="
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/30.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/30.json
new file mode 100644
index 0000000..6449803
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/30.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::float64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::float64>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::float64",
+          "value": {
+            "type": "std::float64",
+            "value": 23.137307026953113
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float64",
+      "value": 23.137307026953113
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/31.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/31.json
new file mode 100644
index 0000000..b7f4cef
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/31.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int16",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int16>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int16",
+          "value": {
+            "type": "std::int16",
+            "value": 26189
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int16",
+      "value": 26189
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/32.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/32.json
new file mode 100644
index 0000000..4c0075a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/32.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int32>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int32",
+          "value": {
+            "type": "std::int32",
+            "value": 465783481
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int32",
+      "value": 465783481
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/33.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/33.json
new file mode 100644
index 0000000..d8f7e86
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/33.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int64>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int64",
+          "value": {
+            "type": "std::int64",
+            "value": 7951118509140678371
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int64",
+      "value": 7951118509140678371
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/34.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/34.json
new file mode 100644
index 0000000..21bf0ec
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/34.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::json",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::json>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::json",
+          "value": {
+            "type": "std::json",
+            "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::json",
+      "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/35.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/35.json
new file mode 100644
index 0000000..d4d05cc
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/35.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_datetime>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_datetime",
+          "value": {
+            "type": "cal::local_datetime",
+            "value": "9496-09-18T03:23:39.2690560"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_datetime",
+      "value": "9496-09-18T03:23:39.2690560"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/36.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/36.json
new file mode 100644
index 0000000..4e1f6da
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/36.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_date",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_date>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_date",
+          "value": {
+            "type": "cal::local_date",
+            "value": "2709-11-06"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_date",
+      "value": "2709-11-06"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/37.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/37.json
new file mode 100644
index 0000000..3d77d20
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/37.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_time",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_time>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_time",
+          "value": {
+            "type": "cal::local_time",
+            "value": "09:46:26.9145310"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_time",
+      "value": "09:46:26.9145310"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/38.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/38.json
new file mode 100644
index 0000000..0e5599e
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/38.json
@@ -0,0 +1,44 @@
+{
+  "name": "Argument of type range<std::int32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <range<std::int32>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "range<std::int32>",
+          "value": {
+            "type": "range",
+            "value": {
+              "lower": 703256282,
+              "upper": 1321671233,
+              "inc_lower": true,
+              "inc_upper": false
+            },
+            "element_type": "std::int32"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": 703256282,
+        "upper": 1321671233,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::int32"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/39.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/39.json
new file mode 100644
index 0000000..aa3d3ce
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/39.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::relative_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::relative_duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::relative_duration",
+          "value": {
+            "type": "cal::relative_duration",
+            "value": "58.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::relative_duration",
+      "value": "58.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/4.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/4.json
new file mode 100644
index 0000000..3d5d0d4
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/4.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::date_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::date_duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::date_duration",
+          "value": {
+            "type": "cal::date_duration",
+            "value": "-29936.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::date_duration",
+      "value": "-29936.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/40.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/40.json
new file mode 100644
index 0000000..7b81851
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/40.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::str",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::str>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::str",
+          "value": {
+            "type": "std::str",
+            "value": "JTUDCPQOVWGJPRC"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::str",
+      "value": "JTUDCPQOVWGJPRC"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/41.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/41.json
new file mode 100644
index 0000000..92d0d6c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/41.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::uuid",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::uuid>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::uuid",
+          "value": {
+            "type": "std::uuid",
+            "value": "3af0fc28-a947-2113-a232-9e44aa72ce41"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::uuid",
+      "value": "3af0fc28-a947-2113-a232-9e44aa72ce41"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/42.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/42.json
new file mode 100644
index 0000000..cc18d64
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/42.json
@@ -0,0 +1,164 @@
+{
+  "name": "Argument of type array<std::bigint>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <array<std::bigint>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "array<std::bigint>",
+          "value": {
+            "type": "array",
+            "value": [
+              {
+                "type": "std::bigint",
+                "value": -14065432626397044
+              },
+              {
+                "type": "std::bigint",
+                "value": 8804349122979362537809440153
+              },
+              {
+                "type": "std::bigint",
+                "value": 8830099280886632714849774461413
+              },
+              {
+                "type": "std::bigint",
+                "value": -292855519598003044315180763070294
+              },
+              {
+                "type": "std::bigint",
+                "value": 2384376342880060027862418810885
+              },
+              {
+                "type": "std::bigint",
+                "value": 31488343488470536352484730622
+              },
+              {
+                "type": "std::bigint",
+                "value": -16406817858068828120556
+              },
+              {
+                "type": "std::bigint",
+                "value": -356367563969219467210675
+              },
+              {
+                "type": "std::bigint",
+                "value": -82343677300221307100199870
+              },
+              {
+                "type": "std::bigint",
+                "value": -403902453281704010607862
+              },
+              {
+                "type": "std::bigint",
+                "value": -2226878259169131492189369944952608
+              },
+              {
+                "type": "std::bigint",
+                "value": -7092626326464961335
+              },
+              {
+                "type": "std::bigint",
+                "value": -8705633103792227562636794644098
+              },
+              {
+                "type": "std::bigint",
+                "value": -139937708679
+              },
+              {
+                "type": "std::bigint",
+                "value": 409227213764
+              },
+              {
+                "type": "std::bigint",
+                "value": 103254578281455688561585809
+              }
+            ],
+            "element_type": "std::bigint"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::bigint",
+          "value": -14065432626397044
+        },
+        {
+          "type": "std::bigint",
+          "value": 8804349122979362537809440153
+        },
+        {
+          "type": "std::bigint",
+          "value": 8830099280886632714849774461413
+        },
+        {
+          "type": "std::bigint",
+          "value": -292855519598003044315180763070294
+        },
+        {
+          "type": "std::bigint",
+          "value": 2384376342880060027862418810885
+        },
+        {
+          "type": "std::bigint",
+          "value": 31488343488470536352484730622
+        },
+        {
+          "type": "std::bigint",
+          "value": -16406817858068828120556
+        },
+        {
+          "type": "std::bigint",
+          "value": -356367563969219467210675
+        },
+        {
+          "type": "std::bigint",
+          "value": -82343677300221307100199870
+        },
+        {
+          "type": "std::bigint",
+          "value": -403902453281704010607862
+        },
+        {
+          "type": "std::bigint",
+          "value": -2226878259169131492189369944952608
+        },
+        {
+          "type": "std::bigint",
+          "value": -7092626326464961335
+        },
+        {
+          "type": "std::bigint",
+          "value": -8705633103792227562636794644098
+        },
+        {
+          "type": "std::bigint",
+          "value": -139937708679
+        },
+        {
+          "type": "std::bigint",
+          "value": 409227213764
+        },
+        {
+          "type": "std::bigint",
+          "value": 103254578281455688561585809
+        }
+      ],
+      "element_type": "std::bigint"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/43.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/43.json
new file mode 100644
index 0000000..4ecce85
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/43.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bigint",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bigint>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bigint",
+          "value": {
+            "type": "std::bigint",
+            "value": -461764231005492946417275
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bigint",
+      "value": -461764231005492946417275
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/44.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/44.json
new file mode 100644
index 0000000..5041e09
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/44.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bool",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bool>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bool",
+          "value": {
+            "type": "std::bool",
+            "value": false
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bool",
+      "value": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/45.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/45.json
new file mode 100644
index 0000000..1d53232
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/45.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bytes",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bytes>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bytes",
+          "value": {
+            "type": "std::bytes",
+            "value": "NFA5QVRJT1lDSlhIVEc="
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bytes",
+      "value": "NFA5QVRJT1lDSlhIVEc="
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/46.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/46.json
new file mode 100644
index 0000000..bf205a7
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/46.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::date_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::date_duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::date_duration",
+          "value": {
+            "type": "cal::date_duration",
+            "value": "20060.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::date_duration",
+      "value": "20060.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/47.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/47.json
new file mode 100644
index 0000000..51fb3ee
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/47.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::datetime>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::datetime",
+          "value": {
+            "type": "std::datetime",
+            "value": "1848-10-09T23:41:47.117531-03:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::datetime",
+      "value": "1848-10-09T23:41:47.117531-03:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/48.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/48.json
new file mode 100644
index 0000000..f677d0a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/48.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::decimal",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::decimal>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::decimal",
+          "value": {
+            "type": "std::decimal",
+            "value": 48.801791353524584
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::decimal",
+      "value": 48.801791353524584
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/49.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/49.json
new file mode 100644
index 0000000..915b921
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/49.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::duration",
+          "value": {
+            "type": "std::duration",
+            "value": "176.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::duration",
+      "value": "176.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/5.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/5.json
new file mode 100644
index 0000000..984086d
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/5.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::datetime>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::datetime",
+          "value": {
+            "type": "std::datetime",
+            "value": "5095-02-07T08:16:22.290064-04:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::datetime",
+      "value": "5095-02-07T08:16:22.290064-04:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/50.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/50.json
new file mode 100644
index 0000000..cc0e03c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/50.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::float32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::float32>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::float32",
+          "value": {
+            "type": "std::float32",
+            "value": -4.060574
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float32",
+      "value": -4.060574
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/51.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/51.json
new file mode 100644
index 0000000..031ec7a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/51.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::float64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::float64>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::float64",
+          "value": {
+            "type": "std::float64",
+            "value": 58.38321005757116
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float64",
+      "value": 58.38321005757116
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/52.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/52.json
new file mode 100644
index 0000000..4690e41
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/52.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int16",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int16>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int16",
+          "value": {
+            "type": "std::int16",
+            "value": 25345
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int16",
+      "value": 25345
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/53.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/53.json
new file mode 100644
index 0000000..6718d2e
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/53.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int32>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int32",
+          "value": {
+            "type": "std::int32",
+            "value": 2068656310
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int32",
+      "value": 2068656310
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/54.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/54.json
new file mode 100644
index 0000000..a098b5a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/54.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int64>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int64",
+          "value": {
+            "type": "std::int64",
+            "value": 4527382037517407493
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int64",
+      "value": 4527382037517407493
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/55.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/55.json
new file mode 100644
index 0000000..21bf0ec
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/55.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::json",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::json>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::json",
+          "value": {
+            "type": "std::json",
+            "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::json",
+      "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/56.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/56.json
new file mode 100644
index 0000000..cf3133c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/56.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_datetime>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_datetime",
+          "value": {
+            "type": "cal::local_datetime",
+            "value": "7363-03-26T01:23:18.5799680"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_datetime",
+      "value": "7363-03-26T01:23:18.5799680"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/57.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/57.json
new file mode 100644
index 0000000..5fedc5b
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/57.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_date",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_date>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_date",
+          "value": {
+            "type": "cal::local_date",
+            "value": "6815-10-19"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_date",
+      "value": "6815-10-19"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/58.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/58.json
new file mode 100644
index 0000000..5ce9405
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/58.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_time",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_time>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_time",
+          "value": {
+            "type": "cal::local_time",
+            "value": "12:49:15.0395940"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_time",
+      "value": "12:49:15.0395940"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/59.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/59.json
new file mode 100644
index 0000000..720f665
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/59.json
@@ -0,0 +1,44 @@
+{
+  "name": "Argument of type range<std::int32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <range<std::int32>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "range<std::int32>",
+          "value": {
+            "type": "range",
+            "value": {
+              "lower": 230329308,
+              "upper": 1282368640,
+              "inc_lower": true,
+              "inc_upper": false
+            },
+            "element_type": "std::int32"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": 230329308,
+        "upper": 1282368640,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::int32"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/6.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/6.json
new file mode 100644
index 0000000..af66d37
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/6.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::decimal",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::decimal>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::decimal",
+          "value": {
+            "type": "std::decimal",
+            "value": 95.3260737714945
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::decimal",
+      "value": 95.3260737714945
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/60.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/60.json
new file mode 100644
index 0000000..de97b13
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/60.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::relative_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::relative_duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::relative_duration",
+          "value": {
+            "type": "cal::relative_duration",
+            "value": "86.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::relative_duration",
+      "value": "86.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/61.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/61.json
new file mode 100644
index 0000000..c044511
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/61.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::str",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::str>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::str",
+          "value": {
+            "type": "std::str",
+            "value": "ZFYVOBQCNFXHYJJ"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::str",
+      "value": "ZFYVOBQCNFXHYJJ"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/62.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/62.json
new file mode 100644
index 0000000..d13677c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/62.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::uuid",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::uuid>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::uuid",
+          "value": {
+            "type": "std::uuid",
+            "value": "9c6e81ee-e89d-48e8-ab61-52168e6d0501"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::uuid",
+      "value": "9c6e81ee-e89d-48e8-ab61-52168e6d0501"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/7.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/7.json
new file mode 100644
index 0000000..ad96b05
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/7.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::duration",
+          "value": {
+            "type": "std::duration",
+            "value": "8.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::duration",
+      "value": "8.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/8.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/8.json
new file mode 100644
index 0000000..2812934
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/8.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::float32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::float32>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::float32",
+          "value": {
+            "type": "std::float32",
+            "value": -17.645004
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float32",
+      "value": -17.645004
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_arguments/9.json b/src/driver/src/test/java/shared/testdefs/v2_arguments/9.json
new file mode 100644
index 0000000..e0fec93
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_arguments/9.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::float64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::float64>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::float64",
+          "value": {
+            "type": "std::float64",
+            "value": 45.26002305292525
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float64",
+      "value": 45.26002305292525
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results.json b/src/driver/src/test/java/shared/testdefs/v2_query_results.json
new file mode 100644
index 0000000..eb0ea5b
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results.json
@@ -0,0 +1,3 @@
+{
+  "name": "V2 Query Results"
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/0.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/0.json
new file mode 100644
index 0000000..625ad8a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/0.json
@@ -0,0 +1,93 @@
+{
+  "name": "Query result of type array<cal::local_date>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<cal::local_date>'4815-09-12', <cal::local_date>'8344-06-20', <cal::local_date>'3925-04-24', <cal::local_date>'9546-05-31', <cal::local_date>'3932-05-09', <cal::local_date>'3124-02-02', <cal::local_date>'1897-02-06', <cal::local_date>'2982-07-22', <cal::local_date>'3972-09-21', <cal::local_date>'6867-10-11', <cal::local_date>'3680-12-02', <cal::local_date>'7920-08-22', <cal::local_date>'9808-07-17', <cal::local_date>'0071-01-11', <cal::local_date>'1973-07-20', <cal::local_date>'3854-11-22', <cal::local_date>'1882-04-08']",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "cal::local_date",
+          "value": "4815-09-12"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "8344-06-20"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "3925-04-24"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "9546-05-31"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "3932-05-09"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "3124-02-02"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "1897-02-06"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "2982-07-22"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "3972-09-21"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "6867-10-11"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "3680-12-02"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "7920-08-22"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "9808-07-17"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "0071-01-11"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "1973-07-20"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "3854-11-22"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "1882-04-08"
+        }
+      ],
+      "element_type": "cal::local_date"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/1.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/1.json
new file mode 100644
index 0000000..91eba50
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/1.json
@@ -0,0 +1,77 @@
+{
+  "name": "Query result of type array<std::uuid>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<uuid>'08071df4-02b6-869a-4c24-c4c01392fbfa', <uuid>'7b71fe42-1b84-85c3-a85c-ba6b29e6e216', <uuid>'0bd14fd7-f1e7-9fbb-58d9-b974b1025168', <uuid>'95ba152f-5fb2-d906-5982-605a482f5d65', <uuid>'c4e9ad42-efc1-5112-43d2-23ab614fd4a5', <uuid>'133b520a-4c2c-7764-48f7-b26591605728', <uuid>'0432547b-8d19-40a6-0368-52e03c5b780a', <uuid>'f550baad-4af3-f639-4871-7bc93dadbfe2', <uuid>'0c2ffa7a-cf1d-7d8c-abfb-10c3f9833bed', <uuid>'d6b7a87f-6210-3135-1b3b-bba711dc0256', <uuid>'41666fa8-6b2c-deed-2ed2-4af83a75fcc5', <uuid>'954a8e36-e9f5-17d1-c5fd-f1e114e46cce', <uuid>'891abaf8-f91d-14c1-bad9-a83e173df7a5']",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::uuid",
+          "value": "08071df4-02b6-869a-4c24-c4c01392fbfa"
+        },
+        {
+          "type": "std::uuid",
+          "value": "7b71fe42-1b84-85c3-a85c-ba6b29e6e216"
+        },
+        {
+          "type": "std::uuid",
+          "value": "0bd14fd7-f1e7-9fbb-58d9-b974b1025168"
+        },
+        {
+          "type": "std::uuid",
+          "value": "95ba152f-5fb2-d906-5982-605a482f5d65"
+        },
+        {
+          "type": "std::uuid",
+          "value": "c4e9ad42-efc1-5112-43d2-23ab614fd4a5"
+        },
+        {
+          "type": "std::uuid",
+          "value": "133b520a-4c2c-7764-48f7-b26591605728"
+        },
+        {
+          "type": "std::uuid",
+          "value": "0432547b-8d19-40a6-0368-52e03c5b780a"
+        },
+        {
+          "type": "std::uuid",
+          "value": "f550baad-4af3-f639-4871-7bc93dadbfe2"
+        },
+        {
+          "type": "std::uuid",
+          "value": "0c2ffa7a-cf1d-7d8c-abfb-10c3f9833bed"
+        },
+        {
+          "type": "std::uuid",
+          "value": "d6b7a87f-6210-3135-1b3b-bba711dc0256"
+        },
+        {
+          "type": "std::uuid",
+          "value": "41666fa8-6b2c-deed-2ed2-4af83a75fcc5"
+        },
+        {
+          "type": "std::uuid",
+          "value": "954a8e36-e9f5-17d1-c5fd-f1e114e46cce"
+        },
+        {
+          "type": "std::uuid",
+          "value": "891abaf8-f91d-14c1-bad9-a83e173df7a5"
+        }
+      ],
+      "element_type": "std::uuid"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/10.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/10.json
new file mode 100644
index 0000000..6da5d14
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/10.json
@@ -0,0 +1,45 @@
+{
+  "name": "Query result of type array<std::datetime>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<datetime>'9654-01-23T08:52:17.83056-04:00', <datetime>'8628-10-23T12:29:42.089792-03:00', <datetime>'4589-06-29T12:50:05.962928-03:00', <datetime>'3418-11-18T01:43:47.054376-04:00', <datetime>'0085-01-04T09:08:48.38404-04:00']",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::datetime",
+          "value": "9654-01-23T08:52:17.83056-04:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "8628-10-23T12:29:42.089792-03:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "4589-06-29T12:50:05.962928-03:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "3418-11-18T01:43:47.054376-04:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "0085-01-04T09:08:48.38404-04:00"
+        }
+      ],
+      "element_type": "std::datetime"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/100.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/100.json
new file mode 100644
index 0000000..bf90290
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/100.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::json",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::json",
+      "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/101.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/101.json
new file mode 100644
index 0000000..2c80181
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/101.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type cal::local_datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_datetime>'0672-12-11T10:14:16.742576'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_datetime",
+      "value": "0672-12-11T10:14:16.7425760"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/102.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/102.json
new file mode 100644
index 0000000..38905cf
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/102.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type cal::local_date",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_date>'5751-06-01'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_date",
+      "value": "5751-06-01"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/103.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/103.json
new file mode 100644
index 0000000..5b4ab20
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/103.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type cal::local_time",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_time>'05:27:31.9295940'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_time",
+      "value": "05:27:31.9295940"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/104.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/104.json
new file mode 100644
index 0000000..07bc57d
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/104.json
@@ -0,0 +1,28 @@
+{
+  "name": "Query result of type namedtuple<std::uuid>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (GOMTSEMUOQXDRKD := <uuid>'450e357f-e694-64da-426b-437287611833')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "GOMTSEMUOQXDRKD": {
+          "type": "std::uuid",
+          "value": "450e357f-e694-64da-426b-437287611833"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/105.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/105.json
new file mode 100644
index 0000000..ccb3563
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/105.json
@@ -0,0 +1,933 @@
+{
+  "name": "Query result of type namedtuple<std::int16, std::bytes, std::float64, cal::date_duration, namedtuple<std::decimal, std::int16>, namedtuple<std::int16, std::decimal>, namedtuple<std::int16, std::decimal>, cal::local_time, array<cal::local_datetime>, array<std::datetime>, array<std::decimal>, array<std::float32>, array<std::uuid>, array<std::uuid>, array<std::float64>, array<std::int64>, array<std::int64>, array<std::int32>, array<std::int16>, array<std::str>, array<cal::local_date>, array<std::json>, array<std::json>, array<std::bytes>, array<cal::relative_duration>>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (TYHYLZVJHBBIMIA := <int16>29941, AWXDNTDBVKJGBWD := b'KN1DGPDLCA7BGGB', AXWPDMFFDXQPLDF := <float64>-18.460195962553936n, YHUIPUPBNWDWQIB := <cal::date_duration>'-7326 days', NLVENZHUMWYUSCL := (DZFOGVOKSIABAGJ := <std::decimal>5.391081743590104n, LHJUUVBVHSDSEAK := <int16>20959), CAPTSXKLFYFUFMB := (NQEQJFKNLNWHZEZ := <int16>21433, BHXMLSJZIPWVABF := <std::decimal>7.8467040941336685n), KFAWWQBHEBDLAZO := (EFDGCYUQAQNSLMQ := <int16>6565, NPLIELHLDOIVWOX := <std::decimal>15.7702711204860n), AYTOLLJVFCJWSKY := <cal::local_time>'12:29:44.5082340', KDBATWUYKMUDCPL := [<cal::local_datetime>'6288-10-01T19:15:33.101616', <cal::local_datetime>'2725-02-09T22:58:58.849688', <cal::local_datetime>'2387-07-21T05:55:55.92678', <cal::local_datetime>'9477-03-07T13:31:25.473632', <cal::local_datetime>'1376-11-18T08:44:55.135524', <cal::local_datetime>'9961-09-01T15:53:39.863808', <cal::local_datetime>'9766-08-27T04:50:48.94176', <cal::local_datetime>'3414-10-12T03:08:41.006544', <cal::local_datetime>'2082-05-01T18:07:54.22525', <cal::local_datetime>'1617-02-20T00:20:12.346718', <cal::local_datetime>'0696-10-24T19:54:31.399336', <cal::local_datetime>'2904-08-25T10:00:09.242424', <cal::local_datetime>'8370-12-19T23:56:31.767616', <cal::local_datetime>'9208-12-11T18:47:02.659264', <cal::local_datetime>'9216-03-20T03:40:59.259488', <cal::local_datetime>'4349-01-24T07:39:59.783136', <cal::local_datetime>'0232-06-12T03:21:21.86064'], DNWGBYQBZOSDNYA := [<datetime>'6520-01-09T10:08:11.971808-04:00', <datetime>'2068-02-11T09:33:48.581445-04:00', <datetime>'5732-09-08T13:26:15.320928-03:00', <datetime>'2496-06-07T17:01:10.876064-03:00', <datetime>'1438-11-11T10:55:04.08026-04:00', <datetime>'0988-06-28T04:31:46.540128-03:00'], OSTQOOWSBCIHSJF := [<std::decimal>1.3674940571037565n, <std::decimal>4.52522717301046n, <std::decimal>9.146049544748872n, <std::decimal>19.142689948502328n, <std::decimal>3.710825246624106n, <std::decimal>10.03718702962492n, <std::decimal>25.580182184269701n, <std::decimal>9.439370581619154n, <std::decimal>23.328664958630064n], ZNKRZBKQSKKLYGE := [<float32>-3.609052n, <float32>33.239086n, <float32>-29.368687n, <float32>28.742863n, <float32>-58.55275n, <float32>18.934885n], RAGNOITVHFCWTFF := [<uuid>'0ac0022a-4f17-abee-75ea-304ea3c686fc', <uuid>'d766e4d0-ea0a-dd90-5178-d94d35b08190', <uuid>'dc487a96-471c-8402-15ce-3711614d1674', <uuid>'3051b2a3-6ff8-3f5d-72e3-b89f75a176c4', <uuid>'29b89f69-a97e-88df-e2e1-c13cb37f7b04', <uuid>'82a96461-505f-2797-1c08-6a398e630e74', <uuid>'c1a77258-ed94-faf6-d3c8-4e16ad218cf2', <uuid>'113db467-f3f7-1964-0791-0c753ea5f97e', <uuid>'40e44dd3-bad7-746f-6daf-af97018179fb'], OHLXHLSSRVVBDNL := [<uuid>'d3c7f910-581f-cfd5-7f32-48006b93ecf4', <uuid>'3d31c882-bf1a-5c2f-2595-5c5935203f77', <uuid>'87d0ec33-59f4-76af-6d8f-bc19d2acd835', <uuid>'05c153b7-48e5-51fd-c96b-ae89fc7c9a5f', <uuid>'7fccd1f3-65c2-28ff-18ba-d08a02168978', <uuid>'e2a226bc-3a5f-eb91-ef7e-bd89ab257af1', <uuid>'00265df5-59df-5273-5399-ec2b77724eb3', <uuid>'d5cc35e1-b7da-b8ff-40e1-8f44a7767cf3', <uuid>'a594df40-88f0-6298-b350-8ec54d65737c', <uuid>'75a70a30-a558-3e17-5d6d-c0fdca2faadc', <uuid>'98ebf91d-a8de-58c2-9c6a-2189283a6bda', <uuid>'9d13126e-06cf-9a9a-c755-4883c89a9884', <uuid>'54a8b2a5-da7a-879d-474e-d9ee838d1523', <uuid>'b78fe501-0d1b-160d-5e50-d088603e8f02', <uuid>'76e49dd1-1791-945f-748c-55802dab173a', <uuid>'e3812440-e00b-9869-a591-f52a09142608'], BEHZLVFUZSEXSLA := [<float64>-61.76927258715465n, <float64>-46.89464747109201n, <float64>-21.5948439094214n, <float64>22.798650235309566n, <float64>19.38573243906057n], SCSPTUKSGDIJHEK := [<std::int64>5562356759553306349, <std::int64>1866908322600161581, <std::int64>4114759374828548282, <std::int64>7101567592439599515, <std::int64>1433193540431532553, <std::int64>4181626997952831411, <std::int64>1234465375541378180, <std::int64>2803337565875829859, <std::int64>8072453667350343999, <std::int64>8756264909732594253, <std::int64>8515312022580584241], DNCRUKWUYKMJXDD := [<std::int64>417188970103902569, <std::int64>6377020538717821662, <std::int64>2574285054083959970, <std::int64>705275108121197347, <std::int64>62917105136941433, <std::int64>1677640312102805073, <std::int64>8291818837117587548, <std::int64>3261831783268985966, <std::int64>3560014687443966108, <std::int64>4714606944170202681, <std::int64>2268279322182042972, <std::int64>5035507199680786035, <std::int64>7488539422762395940, <std::int64>720062401621194118, <std::int64>4113808503470179575, <std::int64>4610539232103685208, <std::int64>4611853279397957335, <std::int64>2968911457591628887], KORAMHIOTSZVSYL := [<int32>794526778, <int32>694900579, <int32>96959116, <int32>1762936856, <int32>94231522], XVEXYTANJYIMZKJ := [<int16>9261, <int16>16562, <int16>26310, <int16>5316, <int16>14825, <int16>16673, <int16>30179, <int16>17792, <int16>13885], GIVHAJCUEHKJVTF := ['TTENQICXQFAGXRB', 'UPOBYKJHENSDUIW', 'BWCZADGBKOZSAKW', 'FJQSSHOJKXJDPZC', 'IZEBOBYRIMRJKRG', 'QBYLRDIUHTPCUDL', 'MSJAGVBDKZJGQEZ', 'RPMOARPFRJUVMVX', 'AGXRHFMVZUASTBE', 'UVLEQXKVCEJWAGR', 'BEFJHHLLCQOFQXL', 'FSBRJSODVCODWQV', 'DKQPWUVMJACAIEE', 'STRIEAGJPCNESIO'], VVCFGVTKWOHIQOV := [<cal::local_date>'3553-07-03', <cal::local_date>'4282-01-18', <cal::local_date>'1209-10-11', <cal::local_date>'9487-10-18', <cal::local_date>'4720-12-28', <cal::local_date>'5783-08-24', <cal::local_date>'1384-06-03', <cal::local_date>'1537-10-05', <cal::local_date>'2723-06-26', <cal::local_date>'0218-11-08', <cal::local_date>'7687-11-30', <cal::local_date>'2630-09-17', <cal::local_date>'6446-07-11', <cal::local_date>'7615-09-06'], LQENCYYXZHLPSYT := [std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}')], WGJWLNJGYBZVZDG := [std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}')], WAJHOZKODRAZLFN := [b'3RB1X9LJ9ML5', b'JS5Q4R24OB67T', b'ODPQET3G8G', b'MSCFP5ZISAWBSJSNO', b'PG4E87GT6GKTD', b'YYR9YY0HGYBA2B8', b'WGO3S09HVG0', b'9S997CN53TZZOHAFD8', b'EVYUEELCYZJ', b'SYDJXZCDZXDOC', b'YOK93EYB6KK844', b'0YESGHBK9MPA4OQS', b'SXQ7218FZQ44', b'16IS10067KXDMVMD5XO', b'APGNYI9HNQ1HR0WT3', b'YRTNWM34OEUB5', b'PB9LY54RA3RPTPWN03', b'U97IW35V645WM', b'83QAL58RHR26H4MH'], DTSHWNUINWGYRDD := [<cal::relative_duration>'5184000 seconds', <cal::relative_duration>'5616000 seconds', <cal::relative_duration>'1296000 seconds', <cal::relative_duration>'2937600 seconds', <cal::relative_duration>'5702400 seconds', <cal::relative_duration>'8035200 seconds', <cal::relative_duration>'3369600 seconds'])",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "TYHYLZVJHBBIMIA": {
+          "type": "std::int16",
+          "value": 29941
+        },
+        "AWXDNTDBVKJGBWD": {
+          "type": "std::bytes",
+          "value": "S04xREdQRExDQTdCR0dC"
+        },
+        "AXWPDMFFDXQPLDF": {
+          "type": "std::float64",
+          "value": -18.460195962553936
+        },
+        "YHUIPUPBNWDWQIB": {
+          "type": "cal::date_duration",
+          "value": "-7326.00:00:00"
+        },
+        "NLVENZHUMWYUSCL": {
+          "type": "namedtuple",
+          "value": {
+            "DZFOGVOKSIABAGJ": {
+              "type": "std::decimal",
+              "value": 5.391081743590104
+            },
+            "LHJUUVBVHSDSEAK": {
+              "type": "std::int16",
+              "value": 20959
+            }
+          }
+        },
+        "CAPTSXKLFYFUFMB": {
+          "type": "namedtuple",
+          "value": {
+            "NQEQJFKNLNWHZEZ": {
+              "type": "std::int16",
+              "value": 21433
+            },
+            "BHXMLSJZIPWVABF": {
+              "type": "std::decimal",
+              "value": 7.8467040941336685
+            }
+          }
+        },
+        "KFAWWQBHEBDLAZO": {
+          "type": "namedtuple",
+          "value": {
+            "EFDGCYUQAQNSLMQ": {
+              "type": "std::int16",
+              "value": 6565
+            },
+            "NPLIELHLDOIVWOX": {
+              "type": "std::decimal",
+              "value": 15.7702711204860
+            }
+          }
+        },
+        "AYTOLLJVFCJWSKY": {
+          "type": "cal::local_time",
+          "value": "12:29:44.5082340"
+        },
+        "KDBATWUYKMUDCPL": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::local_datetime",
+              "value": "6288-10-01T19:15:33.1016160"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "2725-02-09T22:58:58.8496880"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "2387-07-21T05:55:55.9267800"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "9477-03-07T13:31:25.4736320"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "1376-11-18T08:44:55.1355240"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "9961-09-01T15:53:39.8638080"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "9766-08-27T04:50:48.9417600"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "3414-10-12T03:08:41.0065440"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "2082-05-01T18:07:54.2252500"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "1617-02-20T00:20:12.3467180"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "0696-10-24T19:54:31.3993360"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "2904-08-25T10:00:09.2424240"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "8370-12-19T23:56:31.7676160"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "9208-12-11T18:47:02.6592640"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "9216-03-20T03:40:59.2594880"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "4349-01-24T07:39:59.7831360"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "0232-06-12T03:21:21.8606400"
+            }
+          ],
+          "element_type": "cal::local_datetime"
+        },
+        "DNWGBYQBZOSDNYA": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::datetime",
+              "value": "6520-01-09T10:08:11.971808-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "2068-02-11T09:33:48.581445-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "5732-09-08T13:26:15.320928-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "2496-06-07T17:01:10.876064-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "1438-11-11T10:55:04.08026-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "0988-06-28T04:31:46.540128-03:00"
+            }
+          ],
+          "element_type": "std::datetime"
+        },
+        "OSTQOOWSBCIHSJF": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::decimal",
+              "value": 1.3674940571037565
+            },
+            {
+              "type": "std::decimal",
+              "value": 4.52522717301046
+            },
+            {
+              "type": "std::decimal",
+              "value": 9.146049544748872
+            },
+            {
+              "type": "std::decimal",
+              "value": 19.142689948502328
+            },
+            {
+              "type": "std::decimal",
+              "value": 3.710825246624106
+            },
+            {
+              "type": "std::decimal",
+              "value": 10.03718702962492
+            },
+            {
+              "type": "std::decimal",
+              "value": 25.580182184269701
+            },
+            {
+              "type": "std::decimal",
+              "value": 9.439370581619154
+            },
+            {
+              "type": "std::decimal",
+              "value": 23.328664958630064
+            }
+          ],
+          "element_type": "std::decimal"
+        },
+        "ZNKRZBKQSKKLYGE": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::float32",
+              "value": -3.609052
+            },
+            {
+              "type": "std::float32",
+              "value": 33.239086
+            },
+            {
+              "type": "std::float32",
+              "value": -29.368687
+            },
+            {
+              "type": "std::float32",
+              "value": 28.742863
+            },
+            {
+              "type": "std::float32",
+              "value": -58.55275
+            },
+            {
+              "type": "std::float32",
+              "value": 18.934885
+            }
+          ],
+          "element_type": "std::float32"
+        },
+        "RAGNOITVHFCWTFF": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::uuid",
+              "value": "0ac0022a-4f17-abee-75ea-304ea3c686fc"
+            },
+            {
+              "type": "std::uuid",
+              "value": "d766e4d0-ea0a-dd90-5178-d94d35b08190"
+            },
+            {
+              "type": "std::uuid",
+              "value": "dc487a96-471c-8402-15ce-3711614d1674"
+            },
+            {
+              "type": "std::uuid",
+              "value": "3051b2a3-6ff8-3f5d-72e3-b89f75a176c4"
+            },
+            {
+              "type": "std::uuid",
+              "value": "29b89f69-a97e-88df-e2e1-c13cb37f7b04"
+            },
+            {
+              "type": "std::uuid",
+              "value": "82a96461-505f-2797-1c08-6a398e630e74"
+            },
+            {
+              "type": "std::uuid",
+              "value": "c1a77258-ed94-faf6-d3c8-4e16ad218cf2"
+            },
+            {
+              "type": "std::uuid",
+              "value": "113db467-f3f7-1964-0791-0c753ea5f97e"
+            },
+            {
+              "type": "std::uuid",
+              "value": "40e44dd3-bad7-746f-6daf-af97018179fb"
+            }
+          ],
+          "element_type": "std::uuid"
+        },
+        "OHLXHLSSRVVBDNL": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::uuid",
+              "value": "d3c7f910-581f-cfd5-7f32-48006b93ecf4"
+            },
+            {
+              "type": "std::uuid",
+              "value": "3d31c882-bf1a-5c2f-2595-5c5935203f77"
+            },
+            {
+              "type": "std::uuid",
+              "value": "87d0ec33-59f4-76af-6d8f-bc19d2acd835"
+            },
+            {
+              "type": "std::uuid",
+              "value": "05c153b7-48e5-51fd-c96b-ae89fc7c9a5f"
+            },
+            {
+              "type": "std::uuid",
+              "value": "7fccd1f3-65c2-28ff-18ba-d08a02168978"
+            },
+            {
+              "type": "std::uuid",
+              "value": "e2a226bc-3a5f-eb91-ef7e-bd89ab257af1"
+            },
+            {
+              "type": "std::uuid",
+              "value": "00265df5-59df-5273-5399-ec2b77724eb3"
+            },
+            {
+              "type": "std::uuid",
+              "value": "d5cc35e1-b7da-b8ff-40e1-8f44a7767cf3"
+            },
+            {
+              "type": "std::uuid",
+              "value": "a594df40-88f0-6298-b350-8ec54d65737c"
+            },
+            {
+              "type": "std::uuid",
+              "value": "75a70a30-a558-3e17-5d6d-c0fdca2faadc"
+            },
+            {
+              "type": "std::uuid",
+              "value": "98ebf91d-a8de-58c2-9c6a-2189283a6bda"
+            },
+            {
+              "type": "std::uuid",
+              "value": "9d13126e-06cf-9a9a-c755-4883c89a9884"
+            },
+            {
+              "type": "std::uuid",
+              "value": "54a8b2a5-da7a-879d-474e-d9ee838d1523"
+            },
+            {
+              "type": "std::uuid",
+              "value": "b78fe501-0d1b-160d-5e50-d088603e8f02"
+            },
+            {
+              "type": "std::uuid",
+              "value": "76e49dd1-1791-945f-748c-55802dab173a"
+            },
+            {
+              "type": "std::uuid",
+              "value": "e3812440-e00b-9869-a591-f52a09142608"
+            }
+          ],
+          "element_type": "std::uuid"
+        },
+        "BEHZLVFUZSEXSLA": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::float64",
+              "value": -61.76927258715465
+            },
+            {
+              "type": "std::float64",
+              "value": -46.89464747109201
+            },
+            {
+              "type": "std::float64",
+              "value": -21.5948439094214
+            },
+            {
+              "type": "std::float64",
+              "value": 22.798650235309566
+            },
+            {
+              "type": "std::float64",
+              "value": 19.38573243906057
+            }
+          ],
+          "element_type": "std::float64"
+        },
+        "SCSPTUKSGDIJHEK": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::int64",
+              "value": 5562356759553306349
+            },
+            {
+              "type": "std::int64",
+              "value": 1866908322600161581
+            },
+            {
+              "type": "std::int64",
+              "value": 4114759374828548282
+            },
+            {
+              "type": "std::int64",
+              "value": 7101567592439599515
+            },
+            {
+              "type": "std::int64",
+              "value": 1433193540431532553
+            },
+            {
+              "type": "std::int64",
+              "value": 4181626997952831411
+            },
+            {
+              "type": "std::int64",
+              "value": 1234465375541378180
+            },
+            {
+              "type": "std::int64",
+              "value": 2803337565875829859
+            },
+            {
+              "type": "std::int64",
+              "value": 8072453667350343999
+            },
+            {
+              "type": "std::int64",
+              "value": 8756264909732594253
+            },
+            {
+              "type": "std::int64",
+              "value": 8515312022580584241
+            }
+          ],
+          "element_type": "std::int64"
+        },
+        "DNCRUKWUYKMJXDD": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::int64",
+              "value": 417188970103902569
+            },
+            {
+              "type": "std::int64",
+              "value": 6377020538717821662
+            },
+            {
+              "type": "std::int64",
+              "value": 2574285054083959970
+            },
+            {
+              "type": "std::int64",
+              "value": 705275108121197347
+            },
+            {
+              "type": "std::int64",
+              "value": 62917105136941433
+            },
+            {
+              "type": "std::int64",
+              "value": 1677640312102805073
+            },
+            {
+              "type": "std::int64",
+              "value": 8291818837117587548
+            },
+            {
+              "type": "std::int64",
+              "value": 3261831783268985966
+            },
+            {
+              "type": "std::int64",
+              "value": 3560014687443966108
+            },
+            {
+              "type": "std::int64",
+              "value": 4714606944170202681
+            },
+            {
+              "type": "std::int64",
+              "value": 2268279322182042972
+            },
+            {
+              "type": "std::int64",
+              "value": 5035507199680786035
+            },
+            {
+              "type": "std::int64",
+              "value": 7488539422762395940
+            },
+            {
+              "type": "std::int64",
+              "value": 720062401621194118
+            },
+            {
+              "type": "std::int64",
+              "value": 4113808503470179575
+            },
+            {
+              "type": "std::int64",
+              "value": 4610539232103685208
+            },
+            {
+              "type": "std::int64",
+              "value": 4611853279397957335
+            },
+            {
+              "type": "std::int64",
+              "value": 2968911457591628887
+            }
+          ],
+          "element_type": "std::int64"
+        },
+        "KORAMHIOTSZVSYL": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::int32",
+              "value": 794526778
+            },
+            {
+              "type": "std::int32",
+              "value": 694900579
+            },
+            {
+              "type": "std::int32",
+              "value": 96959116
+            },
+            {
+              "type": "std::int32",
+              "value": 1762936856
+            },
+            {
+              "type": "std::int32",
+              "value": 94231522
+            }
+          ],
+          "element_type": "std::int32"
+        },
+        "XVEXYTANJYIMZKJ": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::int16",
+              "value": 9261
+            },
+            {
+              "type": "std::int16",
+              "value": 16562
+            },
+            {
+              "type": "std::int16",
+              "value": 26310
+            },
+            {
+              "type": "std::int16",
+              "value": 5316
+            },
+            {
+              "type": "std::int16",
+              "value": 14825
+            },
+            {
+              "type": "std::int16",
+              "value": 16673
+            },
+            {
+              "type": "std::int16",
+              "value": 30179
+            },
+            {
+              "type": "std::int16",
+              "value": 17792
+            },
+            {
+              "type": "std::int16",
+              "value": 13885
+            }
+          ],
+          "element_type": "std::int16"
+        },
+        "GIVHAJCUEHKJVTF": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::str",
+              "value": "TTENQICXQFAGXRB"
+            },
+            {
+              "type": "std::str",
+              "value": "UPOBYKJHENSDUIW"
+            },
+            {
+              "type": "std::str",
+              "value": "BWCZADGBKOZSAKW"
+            },
+            {
+              "type": "std::str",
+              "value": "FJQSSHOJKXJDPZC"
+            },
+            {
+              "type": "std::str",
+              "value": "IZEBOBYRIMRJKRG"
+            },
+            {
+              "type": "std::str",
+              "value": "QBYLRDIUHTPCUDL"
+            },
+            {
+              "type": "std::str",
+              "value": "MSJAGVBDKZJGQEZ"
+            },
+            {
+              "type": "std::str",
+              "value": "RPMOARPFRJUVMVX"
+            },
+            {
+              "type": "std::str",
+              "value": "AGXRHFMVZUASTBE"
+            },
+            {
+              "type": "std::str",
+              "value": "UVLEQXKVCEJWAGR"
+            },
+            {
+              "type": "std::str",
+              "value": "BEFJHHLLCQOFQXL"
+            },
+            {
+              "type": "std::str",
+              "value": "FSBRJSODVCODWQV"
+            },
+            {
+              "type": "std::str",
+              "value": "DKQPWUVMJACAIEE"
+            },
+            {
+              "type": "std::str",
+              "value": "STRIEAGJPCNESIO"
+            }
+          ],
+          "element_type": "std::str"
+        },
+        "VVCFGVTKWOHIQOV": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::local_date",
+              "value": "3553-07-03"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "4282-01-18"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "1209-10-11"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "9487-10-18"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "4720-12-28"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "5783-08-24"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "1384-06-03"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "1537-10-05"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "2723-06-26"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "0218-11-08"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "7687-11-30"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "2630-09-17"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "6446-07-11"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "7615-09-06"
+            }
+          ],
+          "element_type": "cal::local_date"
+        },
+        "LQENCYYXZHLPSYT": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            }
+          ],
+          "element_type": "std::json"
+        },
+        "WGJWLNJGYBZVZDG": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            }
+          ],
+          "element_type": "std::json"
+        },
+        "WAJHOZKODRAZLFN": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::bytes",
+              "value": "M1JCMVg5TEo5TUw1"
+            },
+            {
+              "type": "std::bytes",
+              "value": "SlM1UTRSMjRPQjY3VA=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "T0RQUUVUM0c4Rw=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "TVNDRlA1WklTQVdCU0pTTk8="
+            },
+            {
+              "type": "std::bytes",
+              "value": "UEc0RTg3R1Q2R0tURA=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "WVlSOVlZMEhHWUJBMkI4"
+            },
+            {
+              "type": "std::bytes",
+              "value": "V0dPM1MwOUhWRzA="
+            },
+            {
+              "type": "std::bytes",
+              "value": "OVM5OTdDTjUzVFpaT0hBRkQ4"
+            },
+            {
+              "type": "std::bytes",
+              "value": "RVZZVUVFTENZWko="
+            },
+            {
+              "type": "std::bytes",
+              "value": "U1lESlhaQ0RaWERPQw=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "WU9LOTNFWUI2S0s4NDQ="
+            },
+            {
+              "type": "std::bytes",
+              "value": "MFlFU0dIQks5TVBBNE9RUw=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "U1hRNzIxOEZaUTQ0"
+            },
+            {
+              "type": "std::bytes",
+              "value": "MTZJUzEwMDY3S1hETVZNRDVYTw=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "QVBHTllJOUhOUTFIUjBXVDM="
+            },
+            {
+              "type": "std::bytes",
+              "value": "WVJUTldNMzRPRVVCNQ=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "UEI5TFk1NFJBM1JQVFBXTjAz"
+            },
+            {
+              "type": "std::bytes",
+              "value": "VTk3SVczNVY2NDVXTQ=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "ODNRQUw1OFJIUjI2SDRNSA=="
+            }
+          ],
+          "element_type": "std::bytes"
+        },
+        "DTSHWNUINWGYRDD": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::relative_duration",
+              "value": "60.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "65.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "15.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "34.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "66.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "93.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "39.00:00:00"
+            }
+          ],
+          "element_type": "cal::relative_duration"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/106.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/106.json
new file mode 100644
index 0000000..b2b8494
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/106.json
@@ -0,0 +1,841 @@
+{
+  "name": "Query result of type namedtuple<std::bytes, std::float64, cal::date_duration, namedtuple<std::uuid, std::bytes, std::decimal>, namedtuple<std::uuid, std::bytes, std::decimal>, namedtuple<std::bytes, std::decimal, std::uuid>, namedtuple<std::decimal, std::uuid, std::bytes>, namedtuple<std::uuid, std::bytes, std::decimal>, cal::local_time, array<cal::relative_duration>, array<std::float64>, array<std::float64>, array<std::json>, array<std::bool>, array<cal::local_time>, array<cal::local_time>, array<std::int64>, array<cal::date_duration>, array<cal::local_date>, array<std::str>, array<std::bytes>, array<std::datetime>, array<std::duration>, std::int16>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (TLMTPAGRUSWQIBH := b'Z4AXTTLV1OHZBYQ4', FCCHOXWAHWLHNMO := <float64>18.04064329855174n, YTNFCWAFUNPCGAH := <cal::date_duration>'3777 days', JDXEQGQXIFYRIOB := (XPRXZKOSBNRUEGF := <uuid>'d150c3d0-d892-687e-6a11-26736927b5aa', BQDSLBFYPECDOWS := b'0VDGOSXDRO', UWSMXHQTOCNXNYF := <std::decimal>72.222651204663652n), ZSSMNWQBAQNZAGB := (LCWSFVYCDYLRPFF := <uuid>'57a20a90-1110-0453-f265-55479072ca03', WTMCBBMEUPIOKZL := b'P8DV2NFF107LT06U6', VVTCNVYIXZYUMVL := <std::decimal>25.522723953948711n), NMNMPIJBEDQUTUR := (EPBILGQLMDFYNBX := b'PUBNXLIN1P', URCGECGRVKFWGVC := <std::decimal>0.09467047410768945n, KOCGOJDTHOVJRPZ := <uuid>'52d32a47-5f2a-a05a-3838-48d0e11e2236'), UGIXOODTCLUSWLT := (WQAIPOCPHSEYDLX := <std::decimal>74.069151358711152n, PLGCAHQQTQAONQX := <uuid>'e8e4c3a8-c516-3f88-e112-b82795c6af73', SIWIJTQTSZUMOTF := b'ASU2I23NJSSG7PA'), DZVEUPFCOUNTKSF := (QWECCTVYNMBVGLV := <uuid>'23d9fb8c-d4c9-ee3a-f272-3d21bd185ac9', IROAGXZJEWQHOJV := b'9J3ZMW9VD13', OKTMOMNPXUZBTZK := <std::decimal>1.1493246411668736n), WYRCMYHGFRSYYNC := <cal::local_time>'07:34:39.8646720', TDETCWFFDHSZJGX := [<cal::relative_duration>'7430400 seconds', <cal::relative_duration>'7516800 seconds', <cal::relative_duration>'7862400 seconds', <cal::relative_duration>'3974400 seconds', <cal::relative_duration>'7948800 seconds', <cal::relative_duration>'6825600 seconds', <cal::relative_duration>'1555200 seconds'], GVXYWMYJEQXFSUB := [<float64>-15.668860513562738n, <float64>-35.21657773909n, <float64>-18.133353000568853n, <float64>16.20159596027881n, <float64>-33.026157529571165n, <float64>1.6486142825561643n, <float64>8.023784333851088n, <float64>-47.977428304486644n, <float64>-1.1983260285101487n, <float64>4.739880254371036n, <float64>26.982230253975015n], QAKJDEPUSXVUOGG := [<float64>-4.2107956787621585n, <float64>41.634514204521906n, <float64>58.81283068042846n, <float64>-25.89527632710304n, <float64>-17.457733498633715n, <float64>-16.34710711722593n, <float64>12.398790968767734n, <float64>0.6706952623420839n, <float64>-28.60476362733392n, <float64>-33.651263677352695n, <float64>6.011163479653729n, <float64>1.3718777687157866n, <float64>28.89892608341711n, <float64>18.901440435508935n, <float64>-5.509598686131461n, <float64>-4.4042510257122345n, <float64>-31.337527142529158n, <float64>21.38267028209878n, <float64>16.756079842688553n], YGBHBQNRSTRXNCQ := [std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}')], TKVVWIGCWXNJJPE := [false, false, false, false, true, false, true, false, false, false, true, false], RXGDSZAWBXVEFSA := [<cal::local_time>'09:51:27.4443440', <cal::local_time>'23:15:01.0021880', <cal::local_time>'09:10:51.3113440', <cal::local_time>'00:11:11.2852030', <cal::local_time>'08:32:45.7208750', <cal::local_time>'06:33:10.7927500', <cal::local_time>'16:38:53.2324690', <cal::local_time>'01:40:38.0505940', <cal::local_time>'14:03:59.0807030'], DFRAJQMFPDGXELH := [<cal::local_time>'00:00:42.4289060', <cal::local_time>'23:05:15.4238750', <cal::local_time>'00:39:00.3622810', <cal::local_time>'04:35:02.7736880', <cal::local_time>'08:22:07.2235620', <cal::local_time>'02:00:18.1150620', <cal::local_time>'20:49:14.9019380', <cal::local_time>'17:12:13.0612810', <cal::local_time>'05:19:20.0266720', <cal::local_time>'01:08:04.8922700'], AUPJGGXRKWMNSMK := [<std::int64>3121030375885712893, <std::int64>7798475442497770182, <std::int64>4186832942540670113, <std::int64>7845867078222103098, <std::int64>4366078121097539185, <std::int64>4837418446315010559, <std::int64>8688654257258979895], PYTEJJMGETXABYR := [<cal::date_duration>'-30924 days', <cal::date_duration>'-14293 days', <cal::date_duration>'19357 days', <cal::date_duration>'15788 days', <cal::date_duration>'8300 days', <cal::date_duration>'19654 days', <cal::date_duration>'8091 days', <cal::date_duration>'-12783 days', <cal::date_duration>'15334 days'], VMYIESBYYONONYI := [<cal::local_date>'1274-07-18', <cal::local_date>'8148-10-14', <cal::local_date>'3469-11-12', <cal::local_date>'7169-10-10', <cal::local_date>'6919-09-22', <cal::local_date>'4510-10-06', <cal::local_date>'1278-01-09', <cal::local_date>'2089-11-14', <cal::local_date>'6685-02-19', <cal::local_date>'5280-01-23', <cal::local_date>'4998-05-28', <cal::local_date>'2814-12-08', <cal::local_date>'6398-09-27', <cal::local_date>'6470-02-15', <cal::local_date>'4694-07-31'], OTBACGBNCNJSSCS := ['HYEGRJWTVQECKNO', 'OITJVFNPAEZTWYL', 'LQKDNRHNKXFKZYK', 'YJZIOOGCLPGMKDW', 'EZQTDLIXBGYXZCQ', 'UJUNYCQXKHSYKUC', 'BJFAHQMNBBGIPIC', 'YDSAJJXCITJVSKN', 'DSWQXQUDXHMWWHI', 'FKZHCCXSLDROHRU', 'OZFXMMKIIODBWBF', 'KHQILFFAUEFTYGW', 'MVHWCKPSZQYNZVV', 'XQDZALFJUECIHQK', 'RXPBTJZASXJUHRB', 'JVWICWEAPYCXHGL', 'GVWCGTQOQDGDCLB', 'DEYLUBAUSOLUHBS'], MAOMUZRPEISZQBY := [b'VLFRNJRMBGXVK6LKUF', b'SMX2V0KKBET4O6', b'LWWX8ZB5361D', b'09J6XHTT8U', b'RC0QISMI1ATYY7H', b'RS5666KLC6XFGL1NC', b'G61UWKTRN0'], HPZLLBACSRPURKJ := [<datetime>'0560-01-04T19:12:09.973768-04:00', <datetime>'4049-08-11T20:03:12.10372-03:00', <datetime>'2796-06-27T13:11:13.891876-03:00', <datetime>'1803-06-16T13:10:44.416351-03:00', <datetime>'6062-07-01T19:29:14.883712-03:00', <datetime>'5904-01-20T03:35:08.374912-04:00', <datetime>'7164-01-28T09:43:39.059296-04:00', <datetime>'3358-11-16T19:10:16.477496-04:00', <datetime>'0022-12-18T21:14:35.753128-04:00', <datetime>'8945-09-08T17:19:32.615104-03:00', <datetime>'8931-10-11T02:24:01.618624-03:00', <datetime>'5696-02-26T04:43:53.398528-04:00', <datetime>'3458-09-04T11:37:09.497584-03:00', <datetime>'3818-04-20T02:11:20.575376-03:00', <datetime>'5102-07-24T11:42:29.089712-03:00', <datetime>'2970-06-30T01:45:56.940672-03:00', <datetime>'8653-10-14T13:02:17.266464-03:00'], HRSTGSHJKOBCEGL := [<duration>'41644800 seconds', <duration>'30412800 seconds', <duration>'11232000 seconds', <duration>'29376000 seconds', <duration>'42854400 seconds', <duration>'11750400 seconds', <duration>'5270400 seconds', <duration>'19526400 seconds', <duration>'7776000 seconds', <duration>'5702400 seconds'], JHCNUPCFMIDOXFE := <int16>4989)",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "TLMTPAGRUSWQIBH": {
+          "type": "std::bytes",
+          "value": "WjRBWFRUTFYxT0haQllRNA=="
+        },
+        "FCCHOXWAHWLHNMO": {
+          "type": "std::float64",
+          "value": 18.04064329855174
+        },
+        "YTNFCWAFUNPCGAH": {
+          "type": "cal::date_duration",
+          "value": "3777.00:00:00"
+        },
+        "JDXEQGQXIFYRIOB": {
+          "type": "namedtuple",
+          "value": {
+            "XPRXZKOSBNRUEGF": {
+              "type": "std::uuid",
+              "value": "d150c3d0-d892-687e-6a11-26736927b5aa"
+            },
+            "BQDSLBFYPECDOWS": {
+              "type": "std::bytes",
+              "value": "MFZER09TWERSTw=="
+            },
+            "UWSMXHQTOCNXNYF": {
+              "type": "std::decimal",
+              "value": 72.222651204663652
+            }
+          }
+        },
+        "ZSSMNWQBAQNZAGB": {
+          "type": "namedtuple",
+          "value": {
+            "LCWSFVYCDYLRPFF": {
+              "type": "std::uuid",
+              "value": "57a20a90-1110-0453-f265-55479072ca03"
+            },
+            "WTMCBBMEUPIOKZL": {
+              "type": "std::bytes",
+              "value": "UDhEVjJORkYxMDdMVDA2VTY="
+            },
+            "VVTCNVYIXZYUMVL": {
+              "type": "std::decimal",
+              "value": 25.522723953948711
+            }
+          }
+        },
+        "NMNMPIJBEDQUTUR": {
+          "type": "namedtuple",
+          "value": {
+            "EPBILGQLMDFYNBX": {
+              "type": "std::bytes",
+              "value": "UFVCTlhMSU4xUA=="
+            },
+            "URCGECGRVKFWGVC": {
+              "type": "std::decimal",
+              "value": 0.09467047410768945
+            },
+            "KOCGOJDTHOVJRPZ": {
+              "type": "std::uuid",
+              "value": "52d32a47-5f2a-a05a-3838-48d0e11e2236"
+            }
+          }
+        },
+        "UGIXOODTCLUSWLT": {
+          "type": "namedtuple",
+          "value": {
+            "WQAIPOCPHSEYDLX": {
+              "type": "std::decimal",
+              "value": 74.069151358711152
+            },
+            "PLGCAHQQTQAONQX": {
+              "type": "std::uuid",
+              "value": "e8e4c3a8-c516-3f88-e112-b82795c6af73"
+            },
+            "SIWIJTQTSZUMOTF": {
+              "type": "std::bytes",
+              "value": "QVNVMkkyM05KU1NHN1BB"
+            }
+          }
+        },
+        "DZVEUPFCOUNTKSF": {
+          "type": "namedtuple",
+          "value": {
+            "QWECCTVYNMBVGLV": {
+              "type": "std::uuid",
+              "value": "23d9fb8c-d4c9-ee3a-f272-3d21bd185ac9"
+            },
+            "IROAGXZJEWQHOJV": {
+              "type": "std::bytes",
+              "value": "OUozWk1XOVZEMTM="
+            },
+            "OKTMOMNPXUZBTZK": {
+              "type": "std::decimal",
+              "value": 1.1493246411668736
+            }
+          }
+        },
+        "WYRCMYHGFRSYYNC": {
+          "type": "cal::local_time",
+          "value": "07:34:39.8646720"
+        },
+        "TDETCWFFDHSZJGX": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::relative_duration",
+              "value": "86.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "87.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "91.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "46.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "92.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "79.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "18.00:00:00"
+            }
+          ],
+          "element_type": "cal::relative_duration"
+        },
+        "GVXYWMYJEQXFSUB": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::float64",
+              "value": -15.668860513562738
+            },
+            {
+              "type": "std::float64",
+              "value": -35.21657773909
+            },
+            {
+              "type": "std::float64",
+              "value": -18.133353000568853
+            },
+            {
+              "type": "std::float64",
+              "value": 16.20159596027881
+            },
+            {
+              "type": "std::float64",
+              "value": -33.026157529571165
+            },
+            {
+              "type": "std::float64",
+              "value": 1.6486142825561643
+            },
+            {
+              "type": "std::float64",
+              "value": 8.023784333851088
+            },
+            {
+              "type": "std::float64",
+              "value": -47.977428304486644
+            },
+            {
+              "type": "std::float64",
+              "value": -1.1983260285101487
+            },
+            {
+              "type": "std::float64",
+              "value": 4.739880254371036
+            },
+            {
+              "type": "std::float64",
+              "value": 26.982230253975015
+            }
+          ],
+          "element_type": "std::float64"
+        },
+        "QAKJDEPUSXVUOGG": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::float64",
+              "value": -4.2107956787621585
+            },
+            {
+              "type": "std::float64",
+              "value": 41.634514204521906
+            },
+            {
+              "type": "std::float64",
+              "value": 58.81283068042846
+            },
+            {
+              "type": "std::float64",
+              "value": -25.89527632710304
+            },
+            {
+              "type": "std::float64",
+              "value": -17.457733498633715
+            },
+            {
+              "type": "std::float64",
+              "value": -16.34710711722593
+            },
+            {
+              "type": "std::float64",
+              "value": 12.398790968767734
+            },
+            {
+              "type": "std::float64",
+              "value": 0.6706952623420839
+            },
+            {
+              "type": "std::float64",
+              "value": -28.60476362733392
+            },
+            {
+              "type": "std::float64",
+              "value": -33.651263677352695
+            },
+            {
+              "type": "std::float64",
+              "value": 6.011163479653729
+            },
+            {
+              "type": "std::float64",
+              "value": 1.3718777687157866
+            },
+            {
+              "type": "std::float64",
+              "value": 28.89892608341711
+            },
+            {
+              "type": "std::float64",
+              "value": 18.901440435508935
+            },
+            {
+              "type": "std::float64",
+              "value": -5.509598686131461
+            },
+            {
+              "type": "std::float64",
+              "value": -4.4042510257122345
+            },
+            {
+              "type": "std::float64",
+              "value": -31.337527142529158
+            },
+            {
+              "type": "std::float64",
+              "value": 21.38267028209878
+            },
+            {
+              "type": "std::float64",
+              "value": 16.756079842688553
+            }
+          ],
+          "element_type": "std::float64"
+        },
+        "YGBHBQNRSTRXNCQ": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            }
+          ],
+          "element_type": "std::json"
+        },
+        "TKVVWIGCWXNJJPE": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::bool",
+              "value": false
+            },
+            {
+              "type": "std::bool",
+              "value": false
+            },
+            {
+              "type": "std::bool",
+              "value": false
+            },
+            {
+              "type": "std::bool",
+              "value": false
+            },
+            {
+              "type": "std::bool",
+              "value": true
+            },
+            {
+              "type": "std::bool",
+              "value": false
+            },
+            {
+              "type": "std::bool",
+              "value": true
+            },
+            {
+              "type": "std::bool",
+              "value": false
+            },
+            {
+              "type": "std::bool",
+              "value": false
+            },
+            {
+              "type": "std::bool",
+              "value": false
+            },
+            {
+              "type": "std::bool",
+              "value": true
+            },
+            {
+              "type": "std::bool",
+              "value": false
+            }
+          ],
+          "element_type": "std::bool"
+        },
+        "RXGDSZAWBXVEFSA": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::local_time",
+              "value": "09:51:27.4443440"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "23:15:01.0021880"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "09:10:51.3113440"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "00:11:11.2852030"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "08:32:45.7208750"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "06:33:10.7927500"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "16:38:53.2324690"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "01:40:38.0505940"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "14:03:59.0807030"
+            }
+          ],
+          "element_type": "cal::local_time"
+        },
+        "DFRAJQMFPDGXELH": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::local_time",
+              "value": "00:00:42.4289060"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "23:05:15.4238750"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "00:39:00.3622810"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "04:35:02.7736880"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "08:22:07.2235620"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "02:00:18.1150620"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "20:49:14.9019380"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "17:12:13.0612810"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "05:19:20.0266720"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "01:08:04.8922700"
+            }
+          ],
+          "element_type": "cal::local_time"
+        },
+        "AUPJGGXRKWMNSMK": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::int64",
+              "value": 3121030375885712893
+            },
+            {
+              "type": "std::int64",
+              "value": 7798475442497770182
+            },
+            {
+              "type": "std::int64",
+              "value": 4186832942540670113
+            },
+            {
+              "type": "std::int64",
+              "value": 7845867078222103098
+            },
+            {
+              "type": "std::int64",
+              "value": 4366078121097539185
+            },
+            {
+              "type": "std::int64",
+              "value": 4837418446315010559
+            },
+            {
+              "type": "std::int64",
+              "value": 8688654257258979895
+            }
+          ],
+          "element_type": "std::int64"
+        },
+        "PYTEJJMGETXABYR": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::date_duration",
+              "value": "-30924.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-14293.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "19357.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "15788.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "8300.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "19654.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "8091.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-12783.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "15334.00:00:00"
+            }
+          ],
+          "element_type": "cal::date_duration"
+        },
+        "VMYIESBYYONONYI": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::local_date",
+              "value": "1274-07-18"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "8148-10-14"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "3469-11-12"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "7169-10-10"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "6919-09-22"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "4510-10-06"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "1278-01-09"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "2089-11-14"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "6685-02-19"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "5280-01-23"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "4998-05-28"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "2814-12-08"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "6398-09-27"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "6470-02-15"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "4694-07-31"
+            }
+          ],
+          "element_type": "cal::local_date"
+        },
+        "OTBACGBNCNJSSCS": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::str",
+              "value": "HYEGRJWTVQECKNO"
+            },
+            {
+              "type": "std::str",
+              "value": "OITJVFNPAEZTWYL"
+            },
+            {
+              "type": "std::str",
+              "value": "LQKDNRHNKXFKZYK"
+            },
+            {
+              "type": "std::str",
+              "value": "YJZIOOGCLPGMKDW"
+            },
+            {
+              "type": "std::str",
+              "value": "EZQTDLIXBGYXZCQ"
+            },
+            {
+              "type": "std::str",
+              "value": "UJUNYCQXKHSYKUC"
+            },
+            {
+              "type": "std::str",
+              "value": "BJFAHQMNBBGIPIC"
+            },
+            {
+              "type": "std::str",
+              "value": "YDSAJJXCITJVSKN"
+            },
+            {
+              "type": "std::str",
+              "value": "DSWQXQUDXHMWWHI"
+            },
+            {
+              "type": "std::str",
+              "value": "FKZHCCXSLDROHRU"
+            },
+            {
+              "type": "std::str",
+              "value": "OZFXMMKIIODBWBF"
+            },
+            {
+              "type": "std::str",
+              "value": "KHQILFFAUEFTYGW"
+            },
+            {
+              "type": "std::str",
+              "value": "MVHWCKPSZQYNZVV"
+            },
+            {
+              "type": "std::str",
+              "value": "XQDZALFJUECIHQK"
+            },
+            {
+              "type": "std::str",
+              "value": "RXPBTJZASXJUHRB"
+            },
+            {
+              "type": "std::str",
+              "value": "JVWICWEAPYCXHGL"
+            },
+            {
+              "type": "std::str",
+              "value": "GVWCGTQOQDGDCLB"
+            },
+            {
+              "type": "std::str",
+              "value": "DEYLUBAUSOLUHBS"
+            }
+          ],
+          "element_type": "std::str"
+        },
+        "MAOMUZRPEISZQBY": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::bytes",
+              "value": "VkxGUk5KUk1CR1hWSzZMS1VG"
+            },
+            {
+              "type": "std::bytes",
+              "value": "U01YMlYwS0tCRVQ0TzY="
+            },
+            {
+              "type": "std::bytes",
+              "value": "TFdXWDhaQjUzNjFE"
+            },
+            {
+              "type": "std::bytes",
+              "value": "MDlKNlhIVFQ4VQ=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "UkMwUUlTTUkxQVRZWTdI"
+            },
+            {
+              "type": "std::bytes",
+              "value": "UlM1NjY2S0xDNlhGR0wxTkM="
+            },
+            {
+              "type": "std::bytes",
+              "value": "RzYxVVdLVFJOMA=="
+            }
+          ],
+          "element_type": "std::bytes"
+        },
+        "HPZLLBACSRPURKJ": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::datetime",
+              "value": "0560-01-04T19:12:09.973768-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "4049-08-11T20:03:12.10372-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "2796-06-27T13:11:13.891876-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "1803-06-16T13:10:44.416351-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "6062-07-01T19:29:14.883712-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "5904-01-20T03:35:08.374912-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "7164-01-28T09:43:39.059296-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "3358-11-16T19:10:16.477496-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "0022-12-18T21:14:35.753128-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "8945-09-08T17:19:32.615104-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "8931-10-11T02:24:01.618624-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "5696-02-26T04:43:53.398528-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "3458-09-04T11:37:09.497584-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "3818-04-20T02:11:20.575376-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "5102-07-24T11:42:29.089712-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "2970-06-30T01:45:56.940672-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "8653-10-14T13:02:17.266464-03:00"
+            }
+          ],
+          "element_type": "std::datetime"
+        },
+        "HRSTGSHJKOBCEGL": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::duration",
+              "value": "482.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "352.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "130.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "340.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "496.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "136.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "61.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "226.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "90.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "66.00:00:00"
+            }
+          ],
+          "element_type": "std::duration"
+        },
+        "JHCNUPCFMIDOXFE": {
+          "type": "std::int16",
+          "value": 4989
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/107.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/107.json
new file mode 100644
index 0000000..ac5cdd1
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/107.json
@@ -0,0 +1,649 @@
+{
+  "name": "Query result of type namedtuple<std::float64, cal::date_duration, namedtuple<cal::relative_duration>, namedtuple<cal::relative_duration>, namedtuple<cal::relative_duration>, cal::local_time, array<std::bytes>, array<std::json>, array<std::int16>, array<std::float64>, array<std::str>, array<std::str>, array<std::int32>, array<cal::local_datetime>, array<std::decimal>, array<std::bigint>, array<cal::local_date>, std::int16, std::bytes>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (YSQDAYOPPCHKPHB := <float64>44.334112057617915n, MOHPEGWCVDJLVDW := <cal::date_duration>'17316 days', JIIOXFNUUXBCZDF := (RSQDLXDVTLGQMHT := <cal::relative_duration>'6480000 seconds'), CJRUXQCBKLZBSEG := (ULDWJAMFMVLYWIN := <cal::relative_duration>'1382400 seconds'), MXTNGUBOBBMETAH := (KSVPWGBXMHCFDFB := <cal::relative_duration>'7689600 seconds'), UGHMTNQCHHZABTV := <cal::local_time>'07:32:35.0593590', MQSOKGVVBYSWLWZ := [b'JAF1QHIN0PXYU9H', b'Q9PY2CFP4QSC5L18WO', b'5KETNEV2V60VIK', b'RER13H6180ZFTYYZC', b'SNULPCUFKUT', b'6J3E4WQ6VI9THTY9CC', b'G7PZ7FGZOGX7LGDEPN', b'6CIGUKPAE6OVCH', b'N8PU69X8BZ8LXNDO', b'VXH4815PRFB4', b'UUYX4GY6SQ', b'FHQW02WAQFAP', b'5QGVEN3VDA'], JQZOYSJCFZRTGFL := [std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}')], AIWODRUJZCSCQQB := [<int16>8338, <int16>11411, <int16>25411, <int16>2394, <int16>2465, <int16>24597, <int16>25133], FBFSYJRRHPTDOGY := [<float64>-63.030457499451224n, <float64>-20.632099282756492n, <float64>-88.87217178608857n, <float64>-41.435753083525114n, <float64>6.506828357235914n, <float64>56.51301777759242n, <float64>2.5931848579054626n, <float64>1.6069865271481623n], HAUAKOWCDDYRSPE := ['HINDYSJOVLZSGXA', 'BILSNKCZWSBZIEG', 'KMKGQWLXJGUSBFC', 'PBWOEVQWFOHGQKG', 'FMHTMTWFWOJHQKY'], PRKGISIPVOACOFH := ['RQYAZINERXYTUQR', 'KGMWKSGTOCQASEL', 'FMXOIYAVAKGLZCK', 'AIBDUYFYKFLXSML', 'LRNITCYLGRWALVU', 'SPAJCINGHYEDMDC', 'YTAHOCHXKPWDCEN', 'KZFDMBKCEHAUYVY', 'OIBSUMYQHCZNLJE', 'LPSNYZBWIXDGBNZ', 'QUOTDUUXAPVJCXQ', 'DXJICLEOHEJXJRO', 'DLWRVKZQVVMIESU', 'GJCDEQLFPAMYKWO', 'ABFRBZZSYSNHYWK', 'KZQZOKQNZRCUYAF', 'HDHDMCJHKKFLCEG', 'PXOLGOUQKRSKWEU', 'MPZUOHBHPIPEFEL'], KJFBLURSJRSUKYL := [<int32>581554160, <int32>2130890884, <int32>1044020862, <int32>369196374, <int32>1010652651, <int32>403839088, <int32>727468257, <int32>1757187449], WXYPLGGXANZSMSX := [<cal::local_datetime>'8852-09-14T08:21:44.377888', <cal::local_datetime>'5566-11-01T20:35:42.589072', <cal::local_datetime>'2706-01-01T15:24:48.371392', <cal::local_datetime>'8772-03-23T02:24:03.125568', <cal::local_datetime>'6457-07-15T19:07:08.937776', <cal::local_datetime>'9065-01-28T21:48:39.359296', <cal::local_datetime>'3802-05-11T18:22:58.400128', <cal::local_datetime>'5604-02-23T06:53:02.86856', <cal::local_datetime>'9220-03-08T16:22:09.336192'], YQXEWGEXUUTFMON := [<std::decimal>69.620194205837418n, <std::decimal>16.6105246732992n, <std::decimal>2.706024440799852n, <std::decimal>23.617850334205608n, <std::decimal>20.813630573830404n, <std::decimal>0n, <std::decimal>2.267094145653348n, <std::decimal>3.124206968175342n, <std::decimal>7.76250422129525n, <std::decimal>3.3055355061337062n, <std::decimal>5.735330971765968n, <std::decimal>23.23450838552536n, <std::decimal>7.056879315086112n, <std::decimal>45.004476211501488n, <std::decimal>6.1769995233868224n, <std::decimal>24.285751089121128n, <std::decimal>12.834079400558988n, <std::decimal>8.681452766378158n, <std::decimal>33.400883743260472n], WWBRUSUFSSKGHWO := [<std::bigint>1172422176n, <std::bigint>-5350295815269560516n, <std::bigint>299294881n, <std::bigint>-92148431973787330574738871n, <std::bigint>-11352178303288n, <std::bigint>-8386435155416712n], ZMBDJRAIYRPLCSV := [<cal::local_date>'6859-02-23', <cal::local_date>'2520-09-15', <cal::local_date>'6713-01-01', <cal::local_date>'9423-05-29', <cal::local_date>'7503-04-10', <cal::local_date>'8448-04-12', <cal::local_date>'6219-01-18', <cal::local_date>'4937-05-13', <cal::local_date>'6402-07-13', <cal::local_date>'6444-10-05', <cal::local_date>'4692-03-12', <cal::local_date>'1746-02-19', <cal::local_date>'3382-03-23', <cal::local_date>'2139-02-01', <cal::local_date>'3132-04-11', <cal::local_date>'9164-08-01', <cal::local_date>'6638-01-28', <cal::local_date>'6774-02-26', <cal::local_date>'8887-09-26'], EDOJNUODIFPJINY := <int16>27724, RFQKQTAOEQLHNLB := b'BBTZLP9KQFPCD53JQSA')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "YSQDAYOPPCHKPHB": {
+          "type": "std::float64",
+          "value": 44.334112057617915
+        },
+        "MOHPEGWCVDJLVDW": {
+          "type": "cal::date_duration",
+          "value": "17316.00:00:00"
+        },
+        "JIIOXFNUUXBCZDF": {
+          "type": "namedtuple",
+          "value": {
+            "RSQDLXDVTLGQMHT": {
+              "type": "cal::relative_duration",
+              "value": "75.00:00:00"
+            }
+          }
+        },
+        "CJRUXQCBKLZBSEG": {
+          "type": "namedtuple",
+          "value": {
+            "ULDWJAMFMVLYWIN": {
+              "type": "cal::relative_duration",
+              "value": "16.00:00:00"
+            }
+          }
+        },
+        "MXTNGUBOBBMETAH": {
+          "type": "namedtuple",
+          "value": {
+            "KSVPWGBXMHCFDFB": {
+              "type": "cal::relative_duration",
+              "value": "89.00:00:00"
+            }
+          }
+        },
+        "UGHMTNQCHHZABTV": {
+          "type": "cal::local_time",
+          "value": "07:32:35.0593590"
+        },
+        "MQSOKGVVBYSWLWZ": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::bytes",
+              "value": "SkFGMVFISU4wUFhZVTlI"
+            },
+            {
+              "type": "std::bytes",
+              "value": "UTlQWTJDRlA0UVNDNUwxOFdP"
+            },
+            {
+              "type": "std::bytes",
+              "value": "NUtFVE5FVjJWNjBWSUs="
+            },
+            {
+              "type": "std::bytes",
+              "value": "UkVSMTNINjE4MFpGVFlZWkM="
+            },
+            {
+              "type": "std::bytes",
+              "value": "U05VTFBDVUZLVVQ="
+            },
+            {
+              "type": "std::bytes",
+              "value": "NkozRTRXUTZWSTlUSFRZOUND"
+            },
+            {
+              "type": "std::bytes",
+              "value": "RzdQWjdGR1pPR1g3TEdERVBO"
+            },
+            {
+              "type": "std::bytes",
+              "value": "NkNJR1VLUEFFNk9WQ0g="
+            },
+            {
+              "type": "std::bytes",
+              "value": "TjhQVTY5WDhCWjhMWE5ETw=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "VlhINDgxNVBSRkI0"
+            },
+            {
+              "type": "std::bytes",
+              "value": "VVVZWDRHWTZTUQ=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "RkhRVzAyV0FRRkFQ"
+            },
+            {
+              "type": "std::bytes",
+              "value": "NVFHVkVOM1ZEQQ=="
+            }
+          ],
+          "element_type": "std::bytes"
+        },
+        "JQZOYSJCFZRTGFL": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            }
+          ],
+          "element_type": "std::json"
+        },
+        "AIWODRUJZCSCQQB": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::int16",
+              "value": 8338
+            },
+            {
+              "type": "std::int16",
+              "value": 11411
+            },
+            {
+              "type": "std::int16",
+              "value": 25411
+            },
+            {
+              "type": "std::int16",
+              "value": 2394
+            },
+            {
+              "type": "std::int16",
+              "value": 2465
+            },
+            {
+              "type": "std::int16",
+              "value": 24597
+            },
+            {
+              "type": "std::int16",
+              "value": 25133
+            }
+          ],
+          "element_type": "std::int16"
+        },
+        "FBFSYJRRHPTDOGY": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::float64",
+              "value": -63.030457499451224
+            },
+            {
+              "type": "std::float64",
+              "value": -20.632099282756492
+            },
+            {
+              "type": "std::float64",
+              "value": -88.87217178608857
+            },
+            {
+              "type": "std::float64",
+              "value": -41.435753083525114
+            },
+            {
+              "type": "std::float64",
+              "value": 6.506828357235914
+            },
+            {
+              "type": "std::float64",
+              "value": 56.51301777759242
+            },
+            {
+              "type": "std::float64",
+              "value": 2.5931848579054626
+            },
+            {
+              "type": "std::float64",
+              "value": 1.6069865271481623
+            }
+          ],
+          "element_type": "std::float64"
+        },
+        "HAUAKOWCDDYRSPE": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::str",
+              "value": "HINDYSJOVLZSGXA"
+            },
+            {
+              "type": "std::str",
+              "value": "BILSNKCZWSBZIEG"
+            },
+            {
+              "type": "std::str",
+              "value": "KMKGQWLXJGUSBFC"
+            },
+            {
+              "type": "std::str",
+              "value": "PBWOEVQWFOHGQKG"
+            },
+            {
+              "type": "std::str",
+              "value": "FMHTMTWFWOJHQKY"
+            }
+          ],
+          "element_type": "std::str"
+        },
+        "PRKGISIPVOACOFH": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::str",
+              "value": "RQYAZINERXYTUQR"
+            },
+            {
+              "type": "std::str",
+              "value": "KGMWKSGTOCQASEL"
+            },
+            {
+              "type": "std::str",
+              "value": "FMXOIYAVAKGLZCK"
+            },
+            {
+              "type": "std::str",
+              "value": "AIBDUYFYKFLXSML"
+            },
+            {
+              "type": "std::str",
+              "value": "LRNITCYLGRWALVU"
+            },
+            {
+              "type": "std::str",
+              "value": "SPAJCINGHYEDMDC"
+            },
+            {
+              "type": "std::str",
+              "value": "YTAHOCHXKPWDCEN"
+            },
+            {
+              "type": "std::str",
+              "value": "KZFDMBKCEHAUYVY"
+            },
+            {
+              "type": "std::str",
+              "value": "OIBSUMYQHCZNLJE"
+            },
+            {
+              "type": "std::str",
+              "value": "LPSNYZBWIXDGBNZ"
+            },
+            {
+              "type": "std::str",
+              "value": "QUOTDUUXAPVJCXQ"
+            },
+            {
+              "type": "std::str",
+              "value": "DXJICLEOHEJXJRO"
+            },
+            {
+              "type": "std::str",
+              "value": "DLWRVKZQVVMIESU"
+            },
+            {
+              "type": "std::str",
+              "value": "GJCDEQLFPAMYKWO"
+            },
+            {
+              "type": "std::str",
+              "value": "ABFRBZZSYSNHYWK"
+            },
+            {
+              "type": "std::str",
+              "value": "KZQZOKQNZRCUYAF"
+            },
+            {
+              "type": "std::str",
+              "value": "HDHDMCJHKKFLCEG"
+            },
+            {
+              "type": "std::str",
+              "value": "PXOLGOUQKRSKWEU"
+            },
+            {
+              "type": "std::str",
+              "value": "MPZUOHBHPIPEFEL"
+            }
+          ],
+          "element_type": "std::str"
+        },
+        "KJFBLURSJRSUKYL": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::int32",
+              "value": 581554160
+            },
+            {
+              "type": "std::int32",
+              "value": 2130890884
+            },
+            {
+              "type": "std::int32",
+              "value": 1044020862
+            },
+            {
+              "type": "std::int32",
+              "value": 369196374
+            },
+            {
+              "type": "std::int32",
+              "value": 1010652651
+            },
+            {
+              "type": "std::int32",
+              "value": 403839088
+            },
+            {
+              "type": "std::int32",
+              "value": 727468257
+            },
+            {
+              "type": "std::int32",
+              "value": 1757187449
+            }
+          ],
+          "element_type": "std::int32"
+        },
+        "WXYPLGGXANZSMSX": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::local_datetime",
+              "value": "8852-09-14T08:21:44.3778880"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "5566-11-01T20:35:42.5890720"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "2706-01-01T15:24:48.3713920"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "8772-03-23T02:24:03.1255680"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "6457-07-15T19:07:08.9377760"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "9065-01-28T21:48:39.3592960"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "3802-05-11T18:22:58.4001280"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "5604-02-23T06:53:02.8685600"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "9220-03-08T16:22:09.3361920"
+            }
+          ],
+          "element_type": "cal::local_datetime"
+        },
+        "YQXEWGEXUUTFMON": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::decimal",
+              "value": 69.620194205837418
+            },
+            {
+              "type": "std::decimal",
+              "value": 16.6105246732992
+            },
+            {
+              "type": "std::decimal",
+              "value": 2.706024440799852
+            },
+            {
+              "type": "std::decimal",
+              "value": 23.617850334205608
+            },
+            {
+              "type": "std::decimal",
+              "value": 20.813630573830404
+            },
+            {
+              "type": "std::decimal",
+              "value": 0.0
+            },
+            {
+              "type": "std::decimal",
+              "value": 2.267094145653348
+            },
+            {
+              "type": "std::decimal",
+              "value": 3.124206968175342
+            },
+            {
+              "type": "std::decimal",
+              "value": 7.76250422129525
+            },
+            {
+              "type": "std::decimal",
+              "value": 3.3055355061337062
+            },
+            {
+              "type": "std::decimal",
+              "value": 5.735330971765968
+            },
+            {
+              "type": "std::decimal",
+              "value": 23.23450838552536
+            },
+            {
+              "type": "std::decimal",
+              "value": 7.056879315086112
+            },
+            {
+              "type": "std::decimal",
+              "value": 45.004476211501488
+            },
+            {
+              "type": "std::decimal",
+              "value": 6.1769995233868224
+            },
+            {
+              "type": "std::decimal",
+              "value": 24.285751089121128
+            },
+            {
+              "type": "std::decimal",
+              "value": 12.834079400558988
+            },
+            {
+              "type": "std::decimal",
+              "value": 8.681452766378158
+            },
+            {
+              "type": "std::decimal",
+              "value": 33.400883743260472
+            }
+          ],
+          "element_type": "std::decimal"
+        },
+        "WWBRUSUFSSKGHWO": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::bigint",
+              "value": 1172422176
+            },
+            {
+              "type": "std::bigint",
+              "value": -5350295815269560516
+            },
+            {
+              "type": "std::bigint",
+              "value": 299294881
+            },
+            {
+              "type": "std::bigint",
+              "value": -92148431973787330574738871
+            },
+            {
+              "type": "std::bigint",
+              "value": -11352178303288
+            },
+            {
+              "type": "std::bigint",
+              "value": -8386435155416712
+            }
+          ],
+          "element_type": "std::bigint"
+        },
+        "ZMBDJRAIYRPLCSV": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::local_date",
+              "value": "6859-02-23"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "2520-09-15"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "6713-01-01"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "9423-05-29"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "7503-04-10"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "8448-04-12"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "6219-01-18"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "4937-05-13"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "6402-07-13"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "6444-10-05"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "4692-03-12"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "1746-02-19"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "3382-03-23"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "2139-02-01"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "3132-04-11"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "9164-08-01"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "6638-01-28"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "6774-02-26"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "8887-09-26"
+            }
+          ],
+          "element_type": "cal::local_date"
+        },
+        "EDOJNUODIFPJINY": {
+          "type": "std::int16",
+          "value": 27724
+        },
+        "RFQKQTAOEQLHNLB": {
+          "type": "std::bytes",
+          "value": "QkJUWkxQOUtRRlBDRDUzSlFTQQ=="
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/108.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/108.json
new file mode 100644
index 0000000..af235c5
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/108.json
@@ -0,0 +1,980 @@
+{
+  "name": "Query result of type namedtuple<cal::date_duration, namedtuple<std::bool, cal::local_datetime, std::decimal, std::float32, std::int16, std::float64, cal::local_date>, namedtuple<cal::local_datetime, std::decimal, std::float32, std::int16, std::float64, cal::local_date, std::bool>, namedtuple<std::decimal, std::float32, std::int16, std::float64, cal::local_date, std::bool, cal::local_datetime>, namedtuple<std::float32, std::int16, std::float64, cal::local_date, std::bool, cal::local_datetime, std::decimal>, namedtuple<std::int16, std::float64, cal::local_date, std::bool, cal::local_datetime, std::decimal, std::float32>, namedtuple<std::int16, std::float64, cal::local_date, std::bool, cal::local_datetime, std::decimal, std::float32>, namedtuple<std::float64, cal::local_date, std::bool, cal::local_datetime, std::decimal, std::float32, std::int16>, namedtuple<cal::local_date, std::bool, cal::local_datetime, std::decimal, std::float32, std::int16, std::float64>, cal::local_time, array<std::json>, array<std::int16>, array<std::bytes>, array<std::bytes>, array<std::decimal>, array<std::float64>, array<std::datetime>, array<cal::local_datetime>, array<std::duration>, array<std::duration>, array<std::duration>, array<cal::date_duration>, std::int16, std::bytes, std::float64>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (GMNKNVJECWVUNLH := <cal::date_duration>'16510 days', CGHIYMIZLIVEVAL := (RONDEMBTEPIQNQO := true, IKUEYOACOJAJYAU := <cal::local_datetime>'3260-08-23T17:22:30.308184', TTZHYPENDIERLUU := <std::decimal>16.558926858268192n, PRLTZMAQDBKGPNI := <float32>52.53106n, OJUPRUFWLCOFWPN := <int16>6250, NATNGHMCDXTQIWX := <float64>20.894552207502795n, VBTYUPPOOVOQBIR := <cal::local_date>'0849-04-18'), BUIBHNNXLFCFQFQ := (KJPTBZXQTXGPGSH := <cal::local_datetime>'6706-06-06T01:15:31.977248', AYLLBNNGBIKNIXP := <std::decimal>72.373587448323920n, ZBJVCWRIKGYQTXK := <float32>-27.208464n, KIVBNZQNDKZQRLC := <int16>11060, LFWPUTDHHKPMCXH := <float64>23.477195621224677n, DAVVLIOYKQHFRPV := <cal::local_date>'0162-12-15', LPPPSUFOBBANSIZ := true), FPPKKGGVTQAFYXH := (XXCURLFQGKHNKRI := <std::decimal>4.932670342238928n, JGLAAJJUYDFJDES := <float32>-50.51316n, FCUJZDZZSKBISBB := <int16>17097, LWWSLXMCKXHDVUW := <float64>39.85292227931922n, PWLWBKRKWVNHBQQ := <cal::local_date>'1838-01-13', ODUFHHOGSVXPFLG := false, YFZAVIUMPGWPFME := <cal::local_datetime>'6002-06-05T01:15:25.089696'), JHEOHPXPIOTURKH := (USLFXSVZTSASRMJ := <float32>-0.72250086n, YYTQPCKMTASXWPK := <int16>13810, SKAQMEVPOEYVEBU := <float64>-13.874423659348126n, BBWCNGBZAUDCGBP := <cal::local_date>'0096-01-30', FLMUXAAYLQOZYMO := false, JRWINJKFUVLBSTP := <cal::local_datetime>'0320-09-24T14:58:29.36008', FXVMDAVEBPMZCHP := <std::decimal>6.616471982848120n), XDHSBBODFPWTWZY := (HRLRGQBDLTYFRNV := <int16>7938, BRXWNVUXAVFIITN := <float64>-1.3203127320484784n, KKMGCDGHDJLRTPD := <cal::local_date>'8177-02-09', BXTVQUGVVVDAKEI := true, WFPKUSHORNODMSF := <cal::local_datetime>'9186-06-09T13:48:23.917696', ZLGCTPGLHICGSFC := <std::decimal>13.547172347338471n, XGXHEMHZGRRJDYC := <float32>4.026581n), VDPIZNKEHYILZQY := (RHSHUUTIOTXEEDN := <int16>131, XAQHXYTUHABYGST := <float64>-12.64103004925001n, MQLAJHUFPFADLIG := <cal::local_date>'0672-07-23', HAUJYMNUSKIBEZN := true, NPMZGACTDOGWPPZ := <cal::local_datetime>'6321-03-31T11:18:02.370976', XQQOODYGRWLDLGN := <std::decimal>36.337334578082564n, RPRBZRPUYGYCVIL := <float32>-0.5732517n), AYLNTPEQPSHTLSU := (ALWQYYUESIOADSJ := <float64>-9.479088003038935n, WFCXLVBABQMMJBZ := <cal::local_date>'3975-10-29', GGDBEHVLADNWJDD := false, XDYNKVXYSOFVFZD := <cal::local_datetime>'3220-08-25T18:53:31.44284', XJFURYGMLSNDSMI := <std::decimal>18.154823910982731n, WLCVLFDMTPPVDJO := <float32>14.100547n, CFFSBYDJUZBXMSW := <int16>9458), QBYZRFFQXQODPCG := (MKXQTBXHVIMRSDD := <cal::local_date>'2895-01-03', RZEVXLAABDIOGEW := false, ZHYQDPEQDISNYUN := <cal::local_datetime>'2585-04-28T19:39:40.614376', YDCSOZWQSXPSPEQ := <std::decimal>31.274175635200995n, VILOJZFUDIMCJUI := <float32>-4.509343n, QLIBZLRPXNDCQPQ := <int16>22320, PJTDNTVOEPOUKLX := <float64>-17.43415544621374n), MGMCSKHGZGWNSDK := <cal::local_time>'02:13:15.4825000', ZODRMNVWDUMCGFK := [std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}')], ERDGBSFMWIHBWRA := [<int16>29203, <int16>21072, <int16>19339, <int16>32475, <int16>32593, <int16>24400, <int16>21144, <int16>8402, <int16>18780, <int16>19498, <int16>25920, <int16>5531, <int16>23553, <int16>679, <int16>14587, <int16>21703, <int16>24204, <int16>30646], KPXVXEQFNUHDMFG := [b'O04Y3MTEQKQL9R', b'YN2147VOZQ6R7XOG', b'H25M9VG5NNUHYE', b'XVGAM0PT3UDI8', b'WRBEBDGXMZ3U7QTBHA', b'R4LQO4P2HB36M', b'917SCXAGAIRH', b'C0A2MC7QBLAWLVM0W', b'5QM91XSFNLK4C0H'], JUEHLULUXKWXTBR := [b'PJIU4MEB0T', b'L2WOMXDONM', b'WIS3BID6WYF5QR', b'DNCTV26D8WV3M8B47', b'9XABAL69E8MG7F7T', b'1M41Y1EVGPQ29U5', b'FS53BN2XXX82'], SLXUJIMBYHXXLVW := [<std::decimal>17.89195720008200n, <std::decimal>69.883118811940350n, <std::decimal>2.65019197326628n, <std::decimal>37.658780948100074n, <std::decimal>20.318666623122368n, <std::decimal>1.680077222026920n, <std::decimal>3.82541094153440n, <std::decimal>30.667956715295035n, <std::decimal>47.756567877603984n, <std::decimal>52.016964979477720n, <std::decimal>13.686678948666288n], EFFZXPOWFLMPGVY := [<float64>88.16326848611388n, <float64>18.485345836023498n, <float64>-32.47750478446367n, <float64>-78.77837365855387n, <float64>-6.597045460993911n, <float64>-40.10641444479414n, <float64>-6.7930207507652325n, <float64>-55.66764341465554n, <float64>-37.4752401045874n, <float64>0.11653412185447948n, <float64>-14.521753772870522n, <float64>-18.004580152223156n, <float64>-10.994518337303083n, <float64>31.672134080749068n, <float64>22.164107880631512n, <float64>-17.756217400429872n], CKIUDZEFYERWKPU := [<datetime>'3181-08-31T06:24:44.11536-03:00', <datetime>'9072-07-25T16:27:39.404608-03:00', <datetime>'8535-07-21T21:03:46.503392-03:00', <datetime>'6876-07-06T07:24:05.649536-03:00', <datetime>'4456-03-05T02:56:22.030848-04:00', <datetime>'1678-09-28T23:11:21.262702-03:00', <datetime>'4453-07-07T18:33:14.996944-03:00', <datetime>'1974-12-03T18:21:23.584734-04:00', <datetime>'5206-08-09T00:38:11.553568-03:00', <datetime>'9284-10-14T04:13:12.316256-03:00', <datetime>'5714-02-24T07:24:40.615888-04:00', <datetime>'7079-09-13T03:08:20.228992-03:00', <datetime>'6161-09-11T03:27:48.900576-03:00', <datetime>'4534-03-16T13:28:26.198464-03:00', <datetime>'7001-09-19T11:09:43.5728-03:00'], AYDWXUSCGJEIAYJ := [<cal::local_datetime>'1289-06-03T14:39:26.53956', <cal::local_datetime>'8860-01-27T16:17:35.229408', <cal::local_datetime>'9667-04-11T15:49:23.492032', <cal::local_datetime>'6164-02-08T12:07:40.35312', <cal::local_datetime>'4222-09-17T21:49:22.39552', <cal::local_datetime>'6336-08-01T05:55:15.06552', <cal::local_datetime>'2370-06-09T00:39:43.690234', <cal::local_datetime>'8944-12-06T23:16:00.479264', <cal::local_datetime>'5814-07-03T14:41:34.465696', <cal::local_datetime>'6270-01-12T22:56:23.63528', <cal::local_datetime>'0458-03-22T14:27:14.520248'], MISYDKRQUHOEULC := [<duration>'7948800 seconds', <duration>'24364800 seconds', <duration>'24105600 seconds', <duration>'5875200 seconds', <duration>'16588800 seconds', <duration>'20995200 seconds', <duration>'24451200 seconds', <duration>'31622400 seconds', <duration>'5702400 seconds', <duration>'25228800 seconds', <duration>'12960000 seconds', <duration>'38793600 seconds', <duration>'42163200 seconds', <duration>'14256000 seconds', <duration>'6393600 seconds', <duration>'29030400 seconds', <duration>'20044800 seconds', <duration>'33091200 seconds', <duration>'864000 seconds'], JXOSUNVIUVZOGUK := [<duration>'20476800 seconds', <duration>'4492800 seconds', <duration>'36374400 seconds', <duration>'6998400 seconds', <duration>'9504000 seconds'], VJTVYKNIRBNSHAW := [<duration>'27907200 seconds', <duration>'9590400 seconds', <duration>'41212800 seconds', <duration>'12528000 seconds', <duration>'25574400 seconds', <duration>'32918400 seconds', <duration>'27561600 seconds', <duration>'8121600 seconds', <duration>'40348800 seconds', <duration>'3801600 seconds'], ZREHEXTIARWYGNI := [<cal::date_duration>'3503 days', <cal::date_duration>'-20399 days', <cal::date_duration>'7740 days', <cal::date_duration>'30773 days', <cal::date_duration>'-22724 days', <cal::date_duration>'-19939 days', <cal::date_duration>'20953 days', <cal::date_duration>'9939 days', <cal::date_duration>'-10511 days', <cal::date_duration>'29318 days', <cal::date_duration>'18390 days'], NIETHSTGHXDVBOW := <int16>13986, JXFNSXBWQYFIONN := b'2D3CPYU89LHSHJ2QU', WRETVKDXQTOYSJQ := <float64>2.628747081676846n)",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "GMNKNVJECWVUNLH": {
+          "type": "cal::date_duration",
+          "value": "16510.00:00:00"
+        },
+        "CGHIYMIZLIVEVAL": {
+          "type": "namedtuple",
+          "value": {
+            "RONDEMBTEPIQNQO": {
+              "type": "std::bool",
+              "value": true
+            },
+            "IKUEYOACOJAJYAU": {
+              "type": "cal::local_datetime",
+              "value": "3260-08-23T17:22:30.3081840"
+            },
+            "TTZHYPENDIERLUU": {
+              "type": "std::decimal",
+              "value": 16.558926858268192
+            },
+            "PRLTZMAQDBKGPNI": {
+              "type": "std::float32",
+              "value": 52.53106
+            },
+            "OJUPRUFWLCOFWPN": {
+              "type": "std::int16",
+              "value": 6250
+            },
+            "NATNGHMCDXTQIWX": {
+              "type": "std::float64",
+              "value": 20.894552207502795
+            },
+            "VBTYUPPOOVOQBIR": {
+              "type": "cal::local_date",
+              "value": "0849-04-18"
+            }
+          }
+        },
+        "BUIBHNNXLFCFQFQ": {
+          "type": "namedtuple",
+          "value": {
+            "KJPTBZXQTXGPGSH": {
+              "type": "cal::local_datetime",
+              "value": "6706-06-06T01:15:31.9772480"
+            },
+            "AYLLBNNGBIKNIXP": {
+              "type": "std::decimal",
+              "value": 72.373587448323920
+            },
+            "ZBJVCWRIKGYQTXK": {
+              "type": "std::float32",
+              "value": -27.208464
+            },
+            "KIVBNZQNDKZQRLC": {
+              "type": "std::int16",
+              "value": 11060
+            },
+            "LFWPUTDHHKPMCXH": {
+              "type": "std::float64",
+              "value": 23.477195621224677
+            },
+            "DAVVLIOYKQHFRPV": {
+              "type": "cal::local_date",
+              "value": "0162-12-15"
+            },
+            "LPPPSUFOBBANSIZ": {
+              "type": "std::bool",
+              "value": true
+            }
+          }
+        },
+        "FPPKKGGVTQAFYXH": {
+          "type": "namedtuple",
+          "value": {
+            "XXCURLFQGKHNKRI": {
+              "type": "std::decimal",
+              "value": 4.932670342238928
+            },
+            "JGLAAJJUYDFJDES": {
+              "type": "std::float32",
+              "value": -50.51316
+            },
+            "FCUJZDZZSKBISBB": {
+              "type": "std::int16",
+              "value": 17097
+            },
+            "LWWSLXMCKXHDVUW": {
+              "type": "std::float64",
+              "value": 39.85292227931922
+            },
+            "PWLWBKRKWVNHBQQ": {
+              "type": "cal::local_date",
+              "value": "1838-01-13"
+            },
+            "ODUFHHOGSVXPFLG": {
+              "type": "std::bool",
+              "value": false
+            },
+            "YFZAVIUMPGWPFME": {
+              "type": "cal::local_datetime",
+              "value": "6002-06-05T01:15:25.0896960"
+            }
+          }
+        },
+        "JHEOHPXPIOTURKH": {
+          "type": "namedtuple",
+          "value": {
+            "USLFXSVZTSASRMJ": {
+              "type": "std::float32",
+              "value": -0.72250086
+            },
+            "YYTQPCKMTASXWPK": {
+              "type": "std::int16",
+              "value": 13810
+            },
+            "SKAQMEVPOEYVEBU": {
+              "type": "std::float64",
+              "value": -13.874423659348126
+            },
+            "BBWCNGBZAUDCGBP": {
+              "type": "cal::local_date",
+              "value": "0096-01-30"
+            },
+            "FLMUXAAYLQOZYMO": {
+              "type": "std::bool",
+              "value": false
+            },
+            "JRWINJKFUVLBSTP": {
+              "type": "cal::local_datetime",
+              "value": "0320-09-24T14:58:29.3600800"
+            },
+            "FXVMDAVEBPMZCHP": {
+              "type": "std::decimal",
+              "value": 6.616471982848120
+            }
+          }
+        },
+        "XDHSBBODFPWTWZY": {
+          "type": "namedtuple",
+          "value": {
+            "HRLRGQBDLTYFRNV": {
+              "type": "std::int16",
+              "value": 7938
+            },
+            "BRXWNVUXAVFIITN": {
+              "type": "std::float64",
+              "value": -1.3203127320484784
+            },
+            "KKMGCDGHDJLRTPD": {
+              "type": "cal::local_date",
+              "value": "8177-02-09"
+            },
+            "BXTVQUGVVVDAKEI": {
+              "type": "std::bool",
+              "value": true
+            },
+            "WFPKUSHORNODMSF": {
+              "type": "cal::local_datetime",
+              "value": "9186-06-09T13:48:23.9176960"
+            },
+            "ZLGCTPGLHICGSFC": {
+              "type": "std::decimal",
+              "value": 13.547172347338471
+            },
+            "XGXHEMHZGRRJDYC": {
+              "type": "std::float32",
+              "value": 4.026581
+            }
+          }
+        },
+        "VDPIZNKEHYILZQY": {
+          "type": "namedtuple",
+          "value": {
+            "RHSHUUTIOTXEEDN": {
+              "type": "std::int16",
+              "value": 131
+            },
+            "XAQHXYTUHABYGST": {
+              "type": "std::float64",
+              "value": -12.64103004925001
+            },
+            "MQLAJHUFPFADLIG": {
+              "type": "cal::local_date",
+              "value": "0672-07-23"
+            },
+            "HAUJYMNUSKIBEZN": {
+              "type": "std::bool",
+              "value": true
+            },
+            "NPMZGACTDOGWPPZ": {
+              "type": "cal::local_datetime",
+              "value": "6321-03-31T11:18:02.3709760"
+            },
+            "XQQOODYGRWLDLGN": {
+              "type": "std::decimal",
+              "value": 36.337334578082564
+            },
+            "RPRBZRPUYGYCVIL": {
+              "type": "std::float32",
+              "value": -0.5732517
+            }
+          }
+        },
+        "AYLNTPEQPSHTLSU": {
+          "type": "namedtuple",
+          "value": {
+            "ALWQYYUESIOADSJ": {
+              "type": "std::float64",
+              "value": -9.479088003038935
+            },
+            "WFCXLVBABQMMJBZ": {
+              "type": "cal::local_date",
+              "value": "3975-10-29"
+            },
+            "GGDBEHVLADNWJDD": {
+              "type": "std::bool",
+              "value": false
+            },
+            "XDYNKVXYSOFVFZD": {
+              "type": "cal::local_datetime",
+              "value": "3220-08-25T18:53:31.4428400"
+            },
+            "XJFURYGMLSNDSMI": {
+              "type": "std::decimal",
+              "value": 18.154823910982731
+            },
+            "WLCVLFDMTPPVDJO": {
+              "type": "std::float32",
+              "value": 14.100547
+            },
+            "CFFSBYDJUZBXMSW": {
+              "type": "std::int16",
+              "value": 9458
+            }
+          }
+        },
+        "QBYZRFFQXQODPCG": {
+          "type": "namedtuple",
+          "value": {
+            "MKXQTBXHVIMRSDD": {
+              "type": "cal::local_date",
+              "value": "2895-01-03"
+            },
+            "RZEVXLAABDIOGEW": {
+              "type": "std::bool",
+              "value": false
+            },
+            "ZHYQDPEQDISNYUN": {
+              "type": "cal::local_datetime",
+              "value": "2585-04-28T19:39:40.6143760"
+            },
+            "YDCSOZWQSXPSPEQ": {
+              "type": "std::decimal",
+              "value": 31.274175635200995
+            },
+            "VILOJZFUDIMCJUI": {
+              "type": "std::float32",
+              "value": -4.509343
+            },
+            "QLIBZLRPXNDCQPQ": {
+              "type": "std::int16",
+              "value": 22320
+            },
+            "PJTDNTVOEPOUKLX": {
+              "type": "std::float64",
+              "value": -17.43415544621374
+            }
+          }
+        },
+        "MGMCSKHGZGWNSDK": {
+          "type": "cal::local_time",
+          "value": "02:13:15.4825000"
+        },
+        "ZODRMNVWDUMCGFK": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            }
+          ],
+          "element_type": "std::json"
+        },
+        "ERDGBSFMWIHBWRA": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::int16",
+              "value": 29203
+            },
+            {
+              "type": "std::int16",
+              "value": 21072
+            },
+            {
+              "type": "std::int16",
+              "value": 19339
+            },
+            {
+              "type": "std::int16",
+              "value": 32475
+            },
+            {
+              "type": "std::int16",
+              "value": 32593
+            },
+            {
+              "type": "std::int16",
+              "value": 24400
+            },
+            {
+              "type": "std::int16",
+              "value": 21144
+            },
+            {
+              "type": "std::int16",
+              "value": 8402
+            },
+            {
+              "type": "std::int16",
+              "value": 18780
+            },
+            {
+              "type": "std::int16",
+              "value": 19498
+            },
+            {
+              "type": "std::int16",
+              "value": 25920
+            },
+            {
+              "type": "std::int16",
+              "value": 5531
+            },
+            {
+              "type": "std::int16",
+              "value": 23553
+            },
+            {
+              "type": "std::int16",
+              "value": 679
+            },
+            {
+              "type": "std::int16",
+              "value": 14587
+            },
+            {
+              "type": "std::int16",
+              "value": 21703
+            },
+            {
+              "type": "std::int16",
+              "value": 24204
+            },
+            {
+              "type": "std::int16",
+              "value": 30646
+            }
+          ],
+          "element_type": "std::int16"
+        },
+        "KPXVXEQFNUHDMFG": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::bytes",
+              "value": "TzA0WTNNVEVRS1FMOVI="
+            },
+            {
+              "type": "std::bytes",
+              "value": "WU4yMTQ3Vk9aUTZSN1hPRw=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "SDI1TTlWRzVOTlVIWUU="
+            },
+            {
+              "type": "std::bytes",
+              "value": "WFZHQU0wUFQzVURJOA=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "V1JCRUJER1hNWjNVN1FUQkhB"
+            },
+            {
+              "type": "std::bytes",
+              "value": "UjRMUU80UDJIQjM2TQ=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "OTE3U0NYQUdBSVJI"
+            },
+            {
+              "type": "std::bytes",
+              "value": "QzBBMk1DN1FCTEFXTFZNMFc="
+            },
+            {
+              "type": "std::bytes",
+              "value": "NVFNOTFYU0ZOTEs0QzBI"
+            }
+          ],
+          "element_type": "std::bytes"
+        },
+        "JUEHLULUXKWXTBR": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::bytes",
+              "value": "UEpJVTRNRUIwVA=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "TDJXT01YRE9OTQ=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "V0lTM0JJRDZXWUY1UVI="
+            },
+            {
+              "type": "std::bytes",
+              "value": "RE5DVFYyNkQ4V1YzTThCNDc="
+            },
+            {
+              "type": "std::bytes",
+              "value": "OVhBQkFMNjlFOE1HN0Y3VA=="
+            },
+            {
+              "type": "std::bytes",
+              "value": "MU00MVkxRVZHUFEyOVU1"
+            },
+            {
+              "type": "std::bytes",
+              "value": "RlM1M0JOMlhYWDgy"
+            }
+          ],
+          "element_type": "std::bytes"
+        },
+        "SLXUJIMBYHXXLVW": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::decimal",
+              "value": 17.89195720008200
+            },
+            {
+              "type": "std::decimal",
+              "value": 69.883118811940350
+            },
+            {
+              "type": "std::decimal",
+              "value": 2.65019197326628
+            },
+            {
+              "type": "std::decimal",
+              "value": 37.658780948100074
+            },
+            {
+              "type": "std::decimal",
+              "value": 20.318666623122368
+            },
+            {
+              "type": "std::decimal",
+              "value": 1.680077222026920
+            },
+            {
+              "type": "std::decimal",
+              "value": 3.82541094153440
+            },
+            {
+              "type": "std::decimal",
+              "value": 30.667956715295035
+            },
+            {
+              "type": "std::decimal",
+              "value": 47.756567877603984
+            },
+            {
+              "type": "std::decimal",
+              "value": 52.016964979477720
+            },
+            {
+              "type": "std::decimal",
+              "value": 13.686678948666288
+            }
+          ],
+          "element_type": "std::decimal"
+        },
+        "EFFZXPOWFLMPGVY": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::float64",
+              "value": 88.16326848611388
+            },
+            {
+              "type": "std::float64",
+              "value": 18.485345836023498
+            },
+            {
+              "type": "std::float64",
+              "value": -32.47750478446367
+            },
+            {
+              "type": "std::float64",
+              "value": -78.77837365855387
+            },
+            {
+              "type": "std::float64",
+              "value": -6.597045460993911
+            },
+            {
+              "type": "std::float64",
+              "value": -40.10641444479414
+            },
+            {
+              "type": "std::float64",
+              "value": -6.7930207507652325
+            },
+            {
+              "type": "std::float64",
+              "value": -55.66764341465554
+            },
+            {
+              "type": "std::float64",
+              "value": -37.4752401045874
+            },
+            {
+              "type": "std::float64",
+              "value": 0.11653412185447948
+            },
+            {
+              "type": "std::float64",
+              "value": -14.521753772870522
+            },
+            {
+              "type": "std::float64",
+              "value": -18.004580152223156
+            },
+            {
+              "type": "std::float64",
+              "value": -10.994518337303083
+            },
+            {
+              "type": "std::float64",
+              "value": 31.672134080749068
+            },
+            {
+              "type": "std::float64",
+              "value": 22.164107880631512
+            },
+            {
+              "type": "std::float64",
+              "value": -17.756217400429872
+            }
+          ],
+          "element_type": "std::float64"
+        },
+        "CKIUDZEFYERWKPU": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::datetime",
+              "value": "3181-08-31T06:24:44.11536-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "9072-07-25T16:27:39.404608-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "8535-07-21T21:03:46.503392-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "6876-07-06T07:24:05.649536-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "4456-03-05T02:56:22.030848-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "1678-09-28T23:11:21.262702-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "4453-07-07T18:33:14.996944-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "1974-12-03T18:21:23.584734-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "5206-08-09T00:38:11.553568-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "9284-10-14T04:13:12.316256-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "5714-02-24T07:24:40.615888-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "7079-09-13T03:08:20.228992-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "6161-09-11T03:27:48.900576-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "4534-03-16T13:28:26.198464-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "7001-09-19T11:09:43.5728-03:00"
+            }
+          ],
+          "element_type": "std::datetime"
+        },
+        "AYDWXUSCGJEIAYJ": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::local_datetime",
+              "value": "1289-06-03T14:39:26.5395600"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "8860-01-27T16:17:35.2294080"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "9667-04-11T15:49:23.4920320"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "6164-02-08T12:07:40.3531200"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "4222-09-17T21:49:22.3955200"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "6336-08-01T05:55:15.0655200"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "2370-06-09T00:39:43.6902340"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "8944-12-06T23:16:00.4792640"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "5814-07-03T14:41:34.4656960"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "6270-01-12T22:56:23.6352800"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "0458-03-22T14:27:14.5202480"
+            }
+          ],
+          "element_type": "cal::local_datetime"
+        },
+        "MISYDKRQUHOEULC": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::duration",
+              "value": "92.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "282.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "279.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "68.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "192.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "243.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "283.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "366.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "66.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "292.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "150.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "449.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "488.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "165.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "74.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "336.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "232.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "383.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "10.00:00:00"
+            }
+          ],
+          "element_type": "std::duration"
+        },
+        "JXOSUNVIUVZOGUK": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::duration",
+              "value": "237.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "52.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "421.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "81.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "110.00:00:00"
+            }
+          ],
+          "element_type": "std::duration"
+        },
+        "VJTVYKNIRBNSHAW": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::duration",
+              "value": "323.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "111.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "477.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "145.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "296.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "381.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "319.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "94.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "467.00:00:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "44.00:00:00"
+            }
+          ],
+          "element_type": "std::duration"
+        },
+        "ZREHEXTIARWYGNI": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::date_duration",
+              "value": "3503.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-20399.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "7740.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "30773.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-22724.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-19939.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "20953.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "9939.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-10511.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "29318.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "18390.00:00:00"
+            }
+          ],
+          "element_type": "cal::date_duration"
+        },
+        "NIETHSTGHXDVBOW": {
+          "type": "std::int16",
+          "value": 13986
+        },
+        "JXFNSXBWQYFIONN": {
+          "type": "std::bytes",
+          "value": "MkQzQ1BZVTg5TEhTSEoyUVU="
+        },
+        "WRETVKDXQTOYSJQ": {
+          "type": "std::float64",
+          "value": 2.628747081676846
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/109.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/109.json
new file mode 100644
index 0000000..ae382a6
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/109.json
@@ -0,0 +1,514 @@
+{
+  "name": "Query result of type namedtuple<namedtuple<std::bigint, std::int32, cal::local_time, std::json, cal::relative_duration>, namedtuple<std::int32, cal::local_time, std::json, cal::relative_duration, std::bigint>, namedtuple<cal::local_time, std::json, cal::relative_duration, std::bigint, std::int32>, namedtuple<cal::local_time, std::json, cal::relative_duration, std::bigint, std::int32>, namedtuple<cal::local_time, std::json, cal::relative_duration, std::bigint, std::int32>, namedtuple<std::json, cal::relative_duration, std::bigint, std::int32, cal::local_time>, namedtuple<std::json, cal::relative_duration, std::bigint, std::int32, cal::local_time>, namedtuple<cal::relative_duration, std::bigint, std::int32, cal::local_time, std::json>, cal::local_time, array<std::float64>, array<std::str>, array<std::str>, array<std::bigint>, array<cal::local_date>, std::int16, std::bytes, std::float64, cal::date_duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (JORIHOKRNRKETTR := (VOAGJYNBVJAPWXC := <std::bigint>-358686537n, IWFKTPGGPUEBSUO := <int32>530080512, SLAQNXNVVQOJWKO := <cal::local_time>'20:09:46.6758910', MRVWQIHVFPWNECO := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), BQTINVZRPXYRWSK := <cal::relative_duration>'5356800 seconds'), EHWLJCCSVHIRHRN := (QUTUYZRSDGTKQYM := <int32>420732908, TZVSISORQRNRZHF := <cal::local_time>'05:47:14.6105160', FXQVVFPDHCJSCWU := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), LOSSIICFCIHDBDY := <cal::relative_duration>'4406400 seconds', ZTPOJYUFOAPFYOV := <std::bigint>-84083588917751539078009418n), MCEDVTCDFOBQXMU := (MAEUMLMPFZFRVTD := <cal::local_time>'04:35:38.6686250', WTLWLJFLRMZMDPG := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), PIKOSKBPOYWNKHL := <cal::relative_duration>'3628800 seconds', EATILARYIUYNDBJ := <std::bigint>-1737290759028462954863703119362519n, BOBYONFEITQKQDC := <int32>959824936), MOHCASIMOBNENEH := (KWYCCUMYBDYMIVP := <cal::local_time>'13:59:05.7280940', QADTHAWSMAMRAUP := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), CFGDJTRCJBXTWDT := <cal::relative_duration>'3888000 seconds', IWDENCWCJQUZGAI := <std::bigint>3892282736752539n, AKGDCWIGAWRYLEO := <int32>251649369), BADXCCAPKTXDDGW := (VDDWSZNHNZKJKXY := <cal::local_time>'04:44:40.7567810', YNLSLYIGOSCLDXQ := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), YQBLGRBMWJCRQEM := <cal::relative_duration>'6652800 seconds', QESKHJEVQEHKWKC := <std::bigint>13048342370069565886914305163n, PJGIEMTXKRGWPQN := <int32>1640142720), AYAXCSFWALWGLKH := (FAUBBRYJWEUABQP := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), SWWEUSMQBMDBWRY := <cal::relative_duration>'2160000 seconds', MKPSSAIZRBYXEVK := <std::bigint>7240285536852947926811843993242n, EFOBOGZBZWOEDRO := <int32>1536611618, RTFTEJSVYXBOSLT := <cal::local_time>'20:22:39.5880860'), WSJDGEWANSZYLVZ := (DYUSTAWVFQIXNHK := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), CYUWISKPISQRTWM := <cal::relative_duration>'604800 seconds', COMYJLWWOYQVYMG := <std::bigint>10921564453331268n, FJAJFCIDGVLSXVT := <int32>1049488723, ZUUTTJGJJOAZAZZ := <cal::local_time>'16:47:58.7813050'), TZLMRLPNODBOJJC := (DDIPULZUZVNHEFW := <cal::relative_duration>'3888000 seconds', ZCTBLIIFFFGFVZF := <std::bigint>98804214912195880403338071553398n, HPAKGIZRUZKPGTO := <int32>350637567, IKFIAUZVVUKZNKX := <cal::local_time>'22:11:46.1554060', YPVPYPZGASDOAFC := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}')), ZPXEAHUAOLOOSHO := <cal::local_time>'04:43:13.6522500', KVZIGJVFCZCWGUO := [<float64>69.44434424370729n, <float64>-54.0604708222954n, <float64>0.6355272031554614n, <float64>22.284932017459038n, <float64>-7.956451990621375n, <float64>-25.36556557722649n, <float64>-69.14790323802639n, <float64>-9.650538162165573n, <float64>-20.52130991058485n], QAGATTNAPDEOGWU := ['SWADNZJCVAHZLLI', 'DKBTYWMWCJYEQGS', 'BXOAURAGPDPDWFG', 'GOQMJIRVKDBEAFM', 'INXNXINMKUEVHIA', 'CPXBPGKTFSPQPWG', 'RZUIHSLXBEBODWN', 'CEBLIKZCDEHFSXW', 'NVEIOSPJDZALEVP', 'EONKUUBGZSEDLGE', 'HOBISFNKPSHIKOX', 'OYAEJMSSTXJVNLY', 'UWEQUHQZBDVCNSV', 'UWPMGAUVVIPUWRW', 'TKNOJHNHIACGRQF', 'CXBRWMQUBJVMRVD', 'GQJCFHBNIHDFXOE'], COSYPFIHTTMZLBP := ['QJDDFUAIBJLVBBG', 'QJFODXATXCBWTZI', 'YUVSLKRXZRFTJZT', 'CWRBQYBTJKFCSDP', 'AOWHFOGGRHPMRGJ', 'IOUWHGGASBIBEOE', 'CDSUCMHOQKJIJPB', 'AGTEJSUTHWPDFEB', 'DUJNOOVWGGGWXYR', 'AGAYUAMJIYMGWDI', 'JGFOFNOLKXXCMYW', 'FMDZDDICIAFPCPZ'], XUNQSCWMRPOXCJX := [<std::bigint>-1836724095113355819n, <std::bigint>-4369349893586053248n, <std::bigint>485040132098n, <std::bigint>-1547399450774380892n, <std::bigint>-351317837984n, <std::bigint>-1872981520619162776813481146801n, <std::bigint>-1655616241824147101942646323n, <std::bigint>-30657510378271580n, <std::bigint>-165458988756869916463202361038902n, <std::bigint>-1503650971642948213168n, <std::bigint>1758585824360388162623n], NLUEMNDUSWQNUEQ := [<cal::local_date>'6044-07-09', <cal::local_date>'7528-06-13', <cal::local_date>'3953-03-29', <cal::local_date>'9560-11-21', <cal::local_date>'2382-08-04', <cal::local_date>'5165-01-29', <cal::local_date>'3437-10-31', <cal::local_date>'6704-10-24', <cal::local_date>'9157-01-14', <cal::local_date>'2564-08-16', <cal::local_date>'0558-06-26'], MDYYCYFWXZAKUPY := <int16>27708, YJHMTUXLUHYMNPG := b'8I1ZVYIOUU', TZDQPMMZXUJTJBM := <float64>-18.182061491618892n, KJTIWJFDPGDWXED := <cal::date_duration>'5581 days')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "JORIHOKRNRKETTR": {
+          "type": "namedtuple",
+          "value": {
+            "VOAGJYNBVJAPWXC": {
+              "type": "std::bigint",
+              "value": -358686537
+            },
+            "IWFKTPGGPUEBSUO": {
+              "type": "std::int32",
+              "value": 530080512
+            },
+            "SLAQNXNVVQOJWKO": {
+              "type": "cal::local_time",
+              "value": "20:09:46.6758910"
+            },
+            "MRVWQIHVFPWNECO": {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            "BQTINVZRPXYRWSK": {
+              "type": "cal::relative_duration",
+              "value": "62.00:00:00"
+            }
+          }
+        },
+        "EHWLJCCSVHIRHRN": {
+          "type": "namedtuple",
+          "value": {
+            "QUTUYZRSDGTKQYM": {
+              "type": "std::int32",
+              "value": 420732908
+            },
+            "TZVSISORQRNRZHF": {
+              "type": "cal::local_time",
+              "value": "05:47:14.6105160"
+            },
+            "FXQVVFPDHCJSCWU": {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            "LOSSIICFCIHDBDY": {
+              "type": "cal::relative_duration",
+              "value": "51.00:00:00"
+            },
+            "ZTPOJYUFOAPFYOV": {
+              "type": "std::bigint",
+              "value": -84083588917751539078009418
+            }
+          }
+        },
+        "MCEDVTCDFOBQXMU": {
+          "type": "namedtuple",
+          "value": {
+            "MAEUMLMPFZFRVTD": {
+              "type": "cal::local_time",
+              "value": "04:35:38.6686250"
+            },
+            "WTLWLJFLRMZMDPG": {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            "PIKOSKBPOYWNKHL": {
+              "type": "cal::relative_duration",
+              "value": "42.00:00:00"
+            },
+            "EATILARYIUYNDBJ": {
+              "type": "std::bigint",
+              "value": -1737290759028462954863703119362519
+            },
+            "BOBYONFEITQKQDC": {
+              "type": "std::int32",
+              "value": 959824936
+            }
+          }
+        },
+        "MOHCASIMOBNENEH": {
+          "type": "namedtuple",
+          "value": {
+            "KWYCCUMYBDYMIVP": {
+              "type": "cal::local_time",
+              "value": "13:59:05.7280940"
+            },
+            "QADTHAWSMAMRAUP": {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            "CFGDJTRCJBXTWDT": {
+              "type": "cal::relative_duration",
+              "value": "45.00:00:00"
+            },
+            "IWDENCWCJQUZGAI": {
+              "type": "std::bigint",
+              "value": 3892282736752539
+            },
+            "AKGDCWIGAWRYLEO": {
+              "type": "std::int32",
+              "value": 251649369
+            }
+          }
+        },
+        "BADXCCAPKTXDDGW": {
+          "type": "namedtuple",
+          "value": {
+            "VDDWSZNHNZKJKXY": {
+              "type": "cal::local_time",
+              "value": "04:44:40.7567810"
+            },
+            "YNLSLYIGOSCLDXQ": {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            "YQBLGRBMWJCRQEM": {
+              "type": "cal::relative_duration",
+              "value": "77.00:00:00"
+            },
+            "QESKHJEVQEHKWKC": {
+              "type": "std::bigint",
+              "value": 13048342370069565886914305163
+            },
+            "PJGIEMTXKRGWPQN": {
+              "type": "std::int32",
+              "value": 1640142720
+            }
+          }
+        },
+        "AYAXCSFWALWGLKH": {
+          "type": "namedtuple",
+          "value": {
+            "FAUBBRYJWEUABQP": {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            "SWWEUSMQBMDBWRY": {
+              "type": "cal::relative_duration",
+              "value": "25.00:00:00"
+            },
+            "MKPSSAIZRBYXEVK": {
+              "type": "std::bigint",
+              "value": 7240285536852947926811843993242
+            },
+            "EFOBOGZBZWOEDRO": {
+              "type": "std::int32",
+              "value": 1536611618
+            },
+            "RTFTEJSVYXBOSLT": {
+              "type": "cal::local_time",
+              "value": "20:22:39.5880860"
+            }
+          }
+        },
+        "WSJDGEWANSZYLVZ": {
+          "type": "namedtuple",
+          "value": {
+            "DYUSTAWVFQIXNHK": {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            "CYUWISKPISQRTWM": {
+              "type": "cal::relative_duration",
+              "value": "7.00:00:00"
+            },
+            "COMYJLWWOYQVYMG": {
+              "type": "std::bigint",
+              "value": 10921564453331268
+            },
+            "FJAJFCIDGVLSXVT": {
+              "type": "std::int32",
+              "value": 1049488723
+            },
+            "ZUUTTJGJJOAZAZZ": {
+              "type": "cal::local_time",
+              "value": "16:47:58.7813050"
+            }
+          }
+        },
+        "TZLMRLPNODBOJJC": {
+          "type": "namedtuple",
+          "value": {
+            "DDIPULZUZVNHEFW": {
+              "type": "cal::relative_duration",
+              "value": "45.00:00:00"
+            },
+            "ZCTBLIIFFFGFVZF": {
+              "type": "std::bigint",
+              "value": 98804214912195880403338071553398
+            },
+            "HPAKGIZRUZKPGTO": {
+              "type": "std::int32",
+              "value": 350637567
+            },
+            "IKFIAUZVVUKZNKX": {
+              "type": "cal::local_time",
+              "value": "22:11:46.1554060"
+            },
+            "YPVPYPZGASDOAFC": {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            }
+          }
+        },
+        "ZPXEAHUAOLOOSHO": {
+          "type": "cal::local_time",
+          "value": "04:43:13.6522500"
+        },
+        "KVZIGJVFCZCWGUO": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::float64",
+              "value": 69.44434424370729
+            },
+            {
+              "type": "std::float64",
+              "value": -54.0604708222954
+            },
+            {
+              "type": "std::float64",
+              "value": 0.6355272031554614
+            },
+            {
+              "type": "std::float64",
+              "value": 22.284932017459038
+            },
+            {
+              "type": "std::float64",
+              "value": -7.956451990621375
+            },
+            {
+              "type": "std::float64",
+              "value": -25.36556557722649
+            },
+            {
+              "type": "std::float64",
+              "value": -69.14790323802639
+            },
+            {
+              "type": "std::float64",
+              "value": -9.650538162165573
+            },
+            {
+              "type": "std::float64",
+              "value": -20.52130991058485
+            }
+          ],
+          "element_type": "std::float64"
+        },
+        "QAGATTNAPDEOGWU": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::str",
+              "value": "SWADNZJCVAHZLLI"
+            },
+            {
+              "type": "std::str",
+              "value": "DKBTYWMWCJYEQGS"
+            },
+            {
+              "type": "std::str",
+              "value": "BXOAURAGPDPDWFG"
+            },
+            {
+              "type": "std::str",
+              "value": "GOQMJIRVKDBEAFM"
+            },
+            {
+              "type": "std::str",
+              "value": "INXNXINMKUEVHIA"
+            },
+            {
+              "type": "std::str",
+              "value": "CPXBPGKTFSPQPWG"
+            },
+            {
+              "type": "std::str",
+              "value": "RZUIHSLXBEBODWN"
+            },
+            {
+              "type": "std::str",
+              "value": "CEBLIKZCDEHFSXW"
+            },
+            {
+              "type": "std::str",
+              "value": "NVEIOSPJDZALEVP"
+            },
+            {
+              "type": "std::str",
+              "value": "EONKUUBGZSEDLGE"
+            },
+            {
+              "type": "std::str",
+              "value": "HOBISFNKPSHIKOX"
+            },
+            {
+              "type": "std::str",
+              "value": "OYAEJMSSTXJVNLY"
+            },
+            {
+              "type": "std::str",
+              "value": "UWEQUHQZBDVCNSV"
+            },
+            {
+              "type": "std::str",
+              "value": "UWPMGAUVVIPUWRW"
+            },
+            {
+              "type": "std::str",
+              "value": "TKNOJHNHIACGRQF"
+            },
+            {
+              "type": "std::str",
+              "value": "CXBRWMQUBJVMRVD"
+            },
+            {
+              "type": "std::str",
+              "value": "GQJCFHBNIHDFXOE"
+            }
+          ],
+          "element_type": "std::str"
+        },
+        "COSYPFIHTTMZLBP": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::str",
+              "value": "QJDDFUAIBJLVBBG"
+            },
+            {
+              "type": "std::str",
+              "value": "QJFODXATXCBWTZI"
+            },
+            {
+              "type": "std::str",
+              "value": "YUVSLKRXZRFTJZT"
+            },
+            {
+              "type": "std::str",
+              "value": "CWRBQYBTJKFCSDP"
+            },
+            {
+              "type": "std::str",
+              "value": "AOWHFOGGRHPMRGJ"
+            },
+            {
+              "type": "std::str",
+              "value": "IOUWHGGASBIBEOE"
+            },
+            {
+              "type": "std::str",
+              "value": "CDSUCMHOQKJIJPB"
+            },
+            {
+              "type": "std::str",
+              "value": "AGTEJSUTHWPDFEB"
+            },
+            {
+              "type": "std::str",
+              "value": "DUJNOOVWGGGWXYR"
+            },
+            {
+              "type": "std::str",
+              "value": "AGAYUAMJIYMGWDI"
+            },
+            {
+              "type": "std::str",
+              "value": "JGFOFNOLKXXCMYW"
+            },
+            {
+              "type": "std::str",
+              "value": "FMDZDDICIAFPCPZ"
+            }
+          ],
+          "element_type": "std::str"
+        },
+        "XUNQSCWMRPOXCJX": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::bigint",
+              "value": -1836724095113355819
+            },
+            {
+              "type": "std::bigint",
+              "value": -4369349893586053248
+            },
+            {
+              "type": "std::bigint",
+              "value": 485040132098
+            },
+            {
+              "type": "std::bigint",
+              "value": -1547399450774380892
+            },
+            {
+              "type": "std::bigint",
+              "value": -351317837984
+            },
+            {
+              "type": "std::bigint",
+              "value": -1872981520619162776813481146801
+            },
+            {
+              "type": "std::bigint",
+              "value": -1655616241824147101942646323
+            },
+            {
+              "type": "std::bigint",
+              "value": -30657510378271580
+            },
+            {
+              "type": "std::bigint",
+              "value": -165458988756869916463202361038902
+            },
+            {
+              "type": "std::bigint",
+              "value": -1503650971642948213168
+            },
+            {
+              "type": "std::bigint",
+              "value": 1758585824360388162623
+            }
+          ],
+          "element_type": "std::bigint"
+        },
+        "NLUEMNDUSWQNUEQ": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::local_date",
+              "value": "6044-07-09"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "7528-06-13"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "3953-03-29"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "9560-11-21"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "2382-08-04"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "5165-01-29"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "3437-10-31"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "6704-10-24"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "9157-01-14"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "2564-08-16"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "0558-06-26"
+            }
+          ],
+          "element_type": "cal::local_date"
+        },
+        "MDYYCYFWXZAKUPY": {
+          "type": "std::int16",
+          "value": 27708
+        },
+        "YJHMTUXLUHYMNPG": {
+          "type": "std::bytes",
+          "value": "OEkxWlZZSU9VVQ=="
+        },
+        "TZDQPMMZXUJTJBM": {
+          "type": "std::float64",
+          "value": -18.182061491618892
+        },
+        "KJTIWJFDPGDWXED": {
+          "type": "cal::date_duration",
+          "value": "5581.00:00:00"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/11.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/11.json
new file mode 100644
index 0000000..1ee1d87
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/11.json
@@ -0,0 +1,69 @@
+{
+  "name": "Query result of type array<std::int64>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<std::int64>6152230848469542915, <std::int64>4722735571006640358, <std::int64>244212659989269255, <std::int64>2860551562550663247, <std::int64>2390820761568525597, <std::int64>3490685637214063527, <std::int64>4876516032711670634, <std::int64>5020474508071507156, <std::int64>3107226508356435731, <std::int64>7687534494266563378, <std::int64>766378682200360508]",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::int64",
+          "value": 6152230848469542915
+        },
+        {
+          "type": "std::int64",
+          "value": 4722735571006640358
+        },
+        {
+          "type": "std::int64",
+          "value": 244212659989269255
+        },
+        {
+          "type": "std::int64",
+          "value": 2860551562550663247
+        },
+        {
+          "type": "std::int64",
+          "value": 2390820761568525597
+        },
+        {
+          "type": "std::int64",
+          "value": 3490685637214063527
+        },
+        {
+          "type": "std::int64",
+          "value": 4876516032711670634
+        },
+        {
+          "type": "std::int64",
+          "value": 5020474508071507156
+        },
+        {
+          "type": "std::int64",
+          "value": 3107226508356435731
+        },
+        {
+          "type": "std::int64",
+          "value": 7687534494266563378
+        },
+        {
+          "type": "std::int64",
+          "value": 766378682200360508
+        }
+      ],
+      "element_type": "std::int64"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/110.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/110.json
new file mode 100644
index 0000000..0e7932b
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/110.json
@@ -0,0 +1,1066 @@
+{
+  "name": "Query result of type namedtuple<cal::local_time, array<std::json>, array<std::decimal>, array<cal::local_datetime>, array<std::bigint>, array<std::bool>, array<std::float64>, array<std::int64>, array<std::int64>, array<cal::date_duration>, array<cal::date_duration>, array<std::uuid>, array<cal::relative_duration>, array<cal::local_date>, array<cal::local_date>, array<std::datetime>, array<std::datetime>, array<std::str>, array<std::int32>, array<std::float32>, std::int16, std::bytes, std::float64, cal::date_duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (RJZAQJIOMJQCKPD := <cal::local_time>'20:12:06.8494530', GZRHGKJXSTXLOFW := [std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}')], ZXLJTKAHXVNMWNT := [<std::decimal>16.029566235854080n, <std::decimal>14.967392093952480n, <std::decimal>58.867333318045073n, <std::decimal>10.488956662122575n, <std::decimal>23.811217557550960n, <std::decimal>9.623607741493560n, <std::decimal>12.445185006803472n, <std::decimal>5.953829307553275n, <std::decimal>13.008363005709078n, <std::decimal>61.758484336900755n, <std::decimal>27.917346252090008n, <std::decimal>63.480070851501096n, <std::decimal>20.19874322004555n, <std::decimal>35.568331746183474n, <std::decimal>18.89350702422368n], TPJRFGOYVGVVPFZ := [<cal::local_datetime>'4067-07-18T10:58:34.401008', <cal::local_datetime>'1199-12-09T15:54:33.297712', <cal::local_datetime>'9113-06-28T19:08:04.829312', <cal::local_datetime>'5189-09-03T06:50:30.225408', <cal::local_datetime>'9523-02-12T10:33:02.02976', <cal::local_datetime>'1706-06-11T12:56:07.437836', <cal::local_datetime>'3770-11-17T22:20:34.011152', <cal::local_datetime>'6336-09-24T16:12:09.52384', <cal::local_datetime>'1492-06-08T09:32:54.985196', <cal::local_datetime>'4015-02-14T08:31:48.938664', <cal::local_datetime>'0531-12-08T09:32:59.025056', <cal::local_datetime>'3874-05-08T13:47:26.403728', <cal::local_datetime>'7703-11-20T16:22:00.881184', <cal::local_datetime>'6921-06-23T06:05:15.253152'], JFJIVCWMBGYORTB := [<std::bigint>-610600929387080029n, <std::bigint>33481367376447730147242610765n, <std::bigint>-147002011214208786419316061n, <std::bigint>-6087236526483020247090927067360n, <std::bigint>214466602436n, <std::bigint>-27176600876866503409054588772n, <std::bigint>-79621461447141n, <std::bigint>487962014877428040448273n, <std::bigint>22566651807610413n, <std::bigint>-3428711511886852373n, <std::bigint>-1533663687206247075389142519664353n, <std::bigint>12745080716675n, <std::bigint>-6705472985450586395n, <std::bigint>53282091312057464363756811n, <std::bigint>384548926824n, <std::bigint>31679378006199876n], UMNVDSEYXNTNZFU := [false, true, true, false, false, true, true, true, false, false], PLWVNZRTYOXEZJK := [<float64>18.139334287559304n, <float64>63.145544074077876n, <float64>41.163814116811295n, <float64>-56.036533700319254n, <float64>-59.55966965554267n, <float64>-16.349222488863965n, <float64>-89.09085295772685n, <float64>-1.0263362447853834n, <float64>40.129957556785065n], BFKQWYUYYODJBDN := [<std::int64>66705059394589921, <std::int64>1810769515814652202, <std::int64>6720974298070853907, <std::int64>860330116607597098, <std::int64>2114271480331533462], YIDTYWNKXOOYVAA := [<std::int64>2933523747228401906, <std::int64>4800550667088836431, <std::int64>2074392066258144086, <std::int64>8503222471553906679, <std::int64>3245615932553350543, <std::int64>238353901293760543, <std::int64>5646265668109422255, <std::int64>9134264049890933061, <std::int64>3872925317431801795], SSXGSSLTQOSGHUH := [<cal::date_duration>'-1283 days', <cal::date_duration>'-15954 days', <cal::date_duration>'9878 days', <cal::date_duration>'22542 days', <cal::date_duration>'17166 days', <cal::date_duration>'14530 days', <cal::date_duration>'20989 days', <cal::date_duration>'-3295 days', <cal::date_duration>'-11692 days', <cal::date_duration>'-26181 days', <cal::date_duration>'7379 days', <cal::date_duration>'11670 days', <cal::date_duration>'-29689 days', <cal::date_duration>'10073 days', <cal::date_duration>'26153 days'], XOMPHZGLQOHEQII := [<cal::date_duration>'4067 days', <cal::date_duration>'-26355 days', <cal::date_duration>'6881 days', <cal::date_duration>'-7100 days', <cal::date_duration>'29414 days', <cal::date_duration>'-5370 days', <cal::date_duration>'-24696 days', <cal::date_duration>'-23339 days', <cal::date_duration>'17806 days', <cal::date_duration>'4796 days', <cal::date_duration>'26138 days', <cal::date_duration>'3467 days', <cal::date_duration>'4785 days', <cal::date_duration>'30989 days', <cal::date_duration>'23392 days', <cal::date_duration>'19493 days', <cal::date_duration>'-12504 days', <cal::date_duration>'22086 days'], AICJOCRGSURMMUN := [<uuid>'9173d8f5-dee7-d4f7-c71b-c6a769fa5db3', <uuid>'63247a4b-52d8-786e-a3c4-e6c2b5c38f4c', <uuid>'e3494e30-d91d-fc4a-63e3-8ee665398a50', <uuid>'660d0b59-d276-a346-6afb-ed22f8341e03', <uuid>'1a777a8c-7ab1-7196-2f27-00f4c387126a', <uuid>'aa68963a-28b5-5ed5-08a5-7921eb28042e', <uuid>'ea5a8bc5-6fc2-df9f-749b-364fd251e0e2', <uuid>'61e783e8-74cc-634d-a518-120b01748607', <uuid>'372fd222-272c-caa7-f788-3519f1868cb7', <uuid>'673996c5-a340-5062-3df6-45a95d94de00', <uuid>'002c2f15-a821-c0b6-db1d-6a433e33711f', <uuid>'6b455a8c-1e3a-7fc6-6fde-fa36e2fd6d62', <uuid>'c20434aa-8c59-1d95-df79-8c23381f1209', <uuid>'021d2685-734e-f6c5-68ac-9043ad80dede', <uuid>'099907af-af2f-00c5-c528-8bc192a34650', <uuid>'bbb1f1cc-6ae0-3614-6e0d-5aadfc526f5f'], UREADYXIKCBNMJV := [<cal::relative_duration>'3715200 seconds', <cal::relative_duration>'6220800 seconds', <cal::relative_duration>'950400 seconds', <cal::relative_duration>'6220800 seconds', <cal::relative_duration>'1728000 seconds', <cal::relative_duration>'7862400 seconds', <cal::relative_duration>'345600 seconds', <cal::relative_duration>'5097600 seconds', <cal::relative_duration>'8294400 seconds', <cal::relative_duration>'6652800 seconds', <cal::relative_duration>'8380800 seconds', <cal::relative_duration>'2937600 seconds', <cal::relative_duration>'172800 seconds', <cal::relative_duration>'691200 seconds', <cal::relative_duration>'8035200 seconds', <cal::relative_duration>'4406400 seconds', <cal::relative_duration>'2332800 seconds'], XSULDDCRQMXMIIF := [<cal::local_date>'7124-12-23', <cal::local_date>'5574-01-31', <cal::local_date>'3868-05-05', <cal::local_date>'5701-11-19', <cal::local_date>'7793-07-23', <cal::local_date>'1120-04-21', <cal::local_date>'4227-08-19', <cal::local_date>'1806-01-16', <cal::local_date>'1855-08-06', <cal::local_date>'9303-08-28', <cal::local_date>'9940-04-10', <cal::local_date>'3911-12-18', <cal::local_date>'0218-03-03', <cal::local_date>'1271-10-14', <cal::local_date>'0181-08-01'], QXCPZPZQOGPSMLQ := [<cal::local_date>'1207-07-21', <cal::local_date>'2267-02-22', <cal::local_date>'9586-07-21', <cal::local_date>'8910-06-25', <cal::local_date>'1335-01-23', <cal::local_date>'1428-09-29', <cal::local_date>'6094-07-20'], GYFCGQIWHRKCDZD := [<datetime>'0196-09-15T23:02:35.518384-03:00', <datetime>'5199-07-25T18:35:12.048-03:00', <datetime>'5323-03-15T11:15:57.234032-03:00', <datetime>'7290-02-19T07:35:48.08336-04:00', <datetime>'7123-02-23T10:27:48.889792-04:00', <datetime>'7290-02-05T21:41:21.64896-04:00', <datetime>'2787-12-23T14:28:38.058564-04:00', <datetime>'8568-06-28T08:21:29.964736-03:00', <datetime>'0904-09-25T11:03:42.365428-03:00', <datetime>'9010-08-12T22:31:43.95312-03:00', <datetime>'9004-08-22T21:03:22.539232-03:00', <datetime>'0595-01-10T12:16:56.253896-04:00', <datetime>'3281-06-04T22:32:40.130736-03:00'], TMFTQUNHQGVEUFA := [<datetime>'1027-11-10T23:02:15.743832-04:00', <datetime>'3937-09-30T04:22:16.400592-03:00', <datetime>'1291-04-23T01:37:19.25278-03:00', <datetime>'1139-05-10T11:56:01.5569-03:00', <datetime>'6229-03-07T02:08:36.04152-04:00', <datetime>'0772-05-08T22:33:31.277952-03:00', <datetime>'6312-03-31T16:50:19.687088-03:00'], FXGESLVYDRQXGMT := ['EKWGCXVZGQOKGXP', 'WJSUSAHWLGZQETT', 'FIBCXZQZMYHHMKR', 'EBIAKQWDDAVWXEV', 'XAFYWNTXTTIUTZJ', 'ODLDLSDOLXYWDUC', 'CUKLFTZQHKHRICK', 'QVHUSSBFXQMYOWT'], RARZPXUUEUVALLG := [<int32>1788867673, <int32>501663509, <int32>684486733, <int32>1026783342, <int32>649113076, <int32>1259912006, <int32>818774533, <int32>1559518480, <int32>410048249, <int32>1191994925], GABLRIAIKLNSAMP := [<float32>-16.327385n, <float32>-33.666264n, <float32>21.176596n, <float32>12.528958n, <float32>-15.134475n, <float32>6.96607n, <float32>-13.232865n, <float32>-42.80559n, <float32>-1.9663128n, <float32>28.918852n, <float32>-32.09169n, <float32>4.675624n, <float32>-6.903943n, <float32>18.24296n, <float32>58.26846n, <float32>-1.7814349n, <float32>75.03716n, <float32>-9.633287n], ZKFKKDDNRTVOZGA := <int16>13589, KPCHUBVWFENAFMZ := b'2E27G7YDL0FJXDD2T73', PJFJJNFYQMLHVPF := <float64>3.2345481115554215n, MXAZVXOFDBTMHRB := <cal::date_duration>'12812 days')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "RJZAQJIOMJQCKPD": {
+          "type": "cal::local_time",
+          "value": "20:12:06.8494530"
+        },
+        "GZRHGKJXSTXLOFW": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            }
+          ],
+          "element_type": "std::json"
+        },
+        "ZXLJTKAHXVNMWNT": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::decimal",
+              "value": 16.029566235854080
+            },
+            {
+              "type": "std::decimal",
+              "value": 14.967392093952480
+            },
+            {
+              "type": "std::decimal",
+              "value": 58.867333318045073
+            },
+            {
+              "type": "std::decimal",
+              "value": 10.488956662122575
+            },
+            {
+              "type": "std::decimal",
+              "value": 23.811217557550960
+            },
+            {
+              "type": "std::decimal",
+              "value": 9.623607741493560
+            },
+            {
+              "type": "std::decimal",
+              "value": 12.445185006803472
+            },
+            {
+              "type": "std::decimal",
+              "value": 5.953829307553275
+            },
+            {
+              "type": "std::decimal",
+              "value": 13.008363005709078
+            },
+            {
+              "type": "std::decimal",
+              "value": 61.758484336900755
+            },
+            {
+              "type": "std::decimal",
+              "value": 27.917346252090008
+            },
+            {
+              "type": "std::decimal",
+              "value": 63.480070851501096
+            },
+            {
+              "type": "std::decimal",
+              "value": 20.19874322004555
+            },
+            {
+              "type": "std::decimal",
+              "value": 35.568331746183474
+            },
+            {
+              "type": "std::decimal",
+              "value": 18.89350702422368
+            }
+          ],
+          "element_type": "std::decimal"
+        },
+        "TPJRFGOYVGVVPFZ": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::local_datetime",
+              "value": "4067-07-18T10:58:34.4010080"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "1199-12-09T15:54:33.2977120"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "9113-06-28T19:08:04.8293120"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "5189-09-03T06:50:30.2254080"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "9523-02-12T10:33:02.0297600"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "1706-06-11T12:56:07.4378360"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "3770-11-17T22:20:34.0111520"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "6336-09-24T16:12:09.5238400"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "1492-06-08T09:32:54.9851960"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "4015-02-14T08:31:48.9386640"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "0531-12-08T09:32:59.0250560"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "3874-05-08T13:47:26.4037280"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "7703-11-20T16:22:00.8811840"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "6921-06-23T06:05:15.2531520"
+            }
+          ],
+          "element_type": "cal::local_datetime"
+        },
+        "JFJIVCWMBGYORTB": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::bigint",
+              "value": -610600929387080029
+            },
+            {
+              "type": "std::bigint",
+              "value": 33481367376447730147242610765
+            },
+            {
+              "type": "std::bigint",
+              "value": -147002011214208786419316061
+            },
+            {
+              "type": "std::bigint",
+              "value": -6087236526483020247090927067360
+            },
+            {
+              "type": "std::bigint",
+              "value": 214466602436
+            },
+            {
+              "type": "std::bigint",
+              "value": -27176600876866503409054588772
+            },
+            {
+              "type": "std::bigint",
+              "value": -79621461447141
+            },
+            {
+              "type": "std::bigint",
+              "value": 487962014877428040448273
+            },
+            {
+              "type": "std::bigint",
+              "value": 22566651807610413
+            },
+            {
+              "type": "std::bigint",
+              "value": -3428711511886852373
+            },
+            {
+              "type": "std::bigint",
+              "value": -1533663687206247075389142519664353
+            },
+            {
+              "type": "std::bigint",
+              "value": 12745080716675
+            },
+            {
+              "type": "std::bigint",
+              "value": -6705472985450586395
+            },
+            {
+              "type": "std::bigint",
+              "value": 53282091312057464363756811
+            },
+            {
+              "type": "std::bigint",
+              "value": 384548926824
+            },
+            {
+              "type": "std::bigint",
+              "value": 31679378006199876
+            }
+          ],
+          "element_type": "std::bigint"
+        },
+        "UMNVDSEYXNTNZFU": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::bool",
+              "value": false
+            },
+            {
+              "type": "std::bool",
+              "value": true
+            },
+            {
+              "type": "std::bool",
+              "value": true
+            },
+            {
+              "type": "std::bool",
+              "value": false
+            },
+            {
+              "type": "std::bool",
+              "value": false
+            },
+            {
+              "type": "std::bool",
+              "value": true
+            },
+            {
+              "type": "std::bool",
+              "value": true
+            },
+            {
+              "type": "std::bool",
+              "value": true
+            },
+            {
+              "type": "std::bool",
+              "value": false
+            },
+            {
+              "type": "std::bool",
+              "value": false
+            }
+          ],
+          "element_type": "std::bool"
+        },
+        "PLWVNZRTYOXEZJK": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::float64",
+              "value": 18.139334287559304
+            },
+            {
+              "type": "std::float64",
+              "value": 63.145544074077876
+            },
+            {
+              "type": "std::float64",
+              "value": 41.163814116811295
+            },
+            {
+              "type": "std::float64",
+              "value": -56.036533700319254
+            },
+            {
+              "type": "std::float64",
+              "value": -59.55966965554267
+            },
+            {
+              "type": "std::float64",
+              "value": -16.349222488863965
+            },
+            {
+              "type": "std::float64",
+              "value": -89.09085295772685
+            },
+            {
+              "type": "std::float64",
+              "value": -1.0263362447853834
+            },
+            {
+              "type": "std::float64",
+              "value": 40.129957556785065
+            }
+          ],
+          "element_type": "std::float64"
+        },
+        "BFKQWYUYYODJBDN": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::int64",
+              "value": 66705059394589921
+            },
+            {
+              "type": "std::int64",
+              "value": 1810769515814652202
+            },
+            {
+              "type": "std::int64",
+              "value": 6720974298070853907
+            },
+            {
+              "type": "std::int64",
+              "value": 860330116607597098
+            },
+            {
+              "type": "std::int64",
+              "value": 2114271480331533462
+            }
+          ],
+          "element_type": "std::int64"
+        },
+        "YIDTYWNKXOOYVAA": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::int64",
+              "value": 2933523747228401906
+            },
+            {
+              "type": "std::int64",
+              "value": 4800550667088836431
+            },
+            {
+              "type": "std::int64",
+              "value": 2074392066258144086
+            },
+            {
+              "type": "std::int64",
+              "value": 8503222471553906679
+            },
+            {
+              "type": "std::int64",
+              "value": 3245615932553350543
+            },
+            {
+              "type": "std::int64",
+              "value": 238353901293760543
+            },
+            {
+              "type": "std::int64",
+              "value": 5646265668109422255
+            },
+            {
+              "type": "std::int64",
+              "value": 9134264049890933061
+            },
+            {
+              "type": "std::int64",
+              "value": 3872925317431801795
+            }
+          ],
+          "element_type": "std::int64"
+        },
+        "SSXGSSLTQOSGHUH": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::date_duration",
+              "value": "-1283.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-15954.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "9878.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "22542.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "17166.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "14530.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "20989.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-3295.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-11692.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-26181.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "7379.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "11670.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-29689.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "10073.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "26153.00:00:00"
+            }
+          ],
+          "element_type": "cal::date_duration"
+        },
+        "XOMPHZGLQOHEQII": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::date_duration",
+              "value": "4067.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-26355.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "6881.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-7100.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "29414.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-5370.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-24696.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-23339.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "17806.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "4796.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "26138.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "3467.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "4785.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "30989.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "23392.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "19493.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-12504.00:00:00"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "22086.00:00:00"
+            }
+          ],
+          "element_type": "cal::date_duration"
+        },
+        "AICJOCRGSURMMUN": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::uuid",
+              "value": "9173d8f5-dee7-d4f7-c71b-c6a769fa5db3"
+            },
+            {
+              "type": "std::uuid",
+              "value": "63247a4b-52d8-786e-a3c4-e6c2b5c38f4c"
+            },
+            {
+              "type": "std::uuid",
+              "value": "e3494e30-d91d-fc4a-63e3-8ee665398a50"
+            },
+            {
+              "type": "std::uuid",
+              "value": "660d0b59-d276-a346-6afb-ed22f8341e03"
+            },
+            {
+              "type": "std::uuid",
+              "value": "1a777a8c-7ab1-7196-2f27-00f4c387126a"
+            },
+            {
+              "type": "std::uuid",
+              "value": "aa68963a-28b5-5ed5-08a5-7921eb28042e"
+            },
+            {
+              "type": "std::uuid",
+              "value": "ea5a8bc5-6fc2-df9f-749b-364fd251e0e2"
+            },
+            {
+              "type": "std::uuid",
+              "value": "61e783e8-74cc-634d-a518-120b01748607"
+            },
+            {
+              "type": "std::uuid",
+              "value": "372fd222-272c-caa7-f788-3519f1868cb7"
+            },
+            {
+              "type": "std::uuid",
+              "value": "673996c5-a340-5062-3df6-45a95d94de00"
+            },
+            {
+              "type": "std::uuid",
+              "value": "002c2f15-a821-c0b6-db1d-6a433e33711f"
+            },
+            {
+              "type": "std::uuid",
+              "value": "6b455a8c-1e3a-7fc6-6fde-fa36e2fd6d62"
+            },
+            {
+              "type": "std::uuid",
+              "value": "c20434aa-8c59-1d95-df79-8c23381f1209"
+            },
+            {
+              "type": "std::uuid",
+              "value": "021d2685-734e-f6c5-68ac-9043ad80dede"
+            },
+            {
+              "type": "std::uuid",
+              "value": "099907af-af2f-00c5-c528-8bc192a34650"
+            },
+            {
+              "type": "std::uuid",
+              "value": "bbb1f1cc-6ae0-3614-6e0d-5aadfc526f5f"
+            }
+          ],
+          "element_type": "std::uuid"
+        },
+        "UREADYXIKCBNMJV": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::relative_duration",
+              "value": "43.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "72.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "11.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "72.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "20.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "91.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "4.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "59.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "96.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "77.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "97.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "34.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "2.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "8.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "93.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "51.00:00:00"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "27.00:00:00"
+            }
+          ],
+          "element_type": "cal::relative_duration"
+        },
+        "XSULDDCRQMXMIIF": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::local_date",
+              "value": "7124-12-23"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "5574-01-31"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "3868-05-05"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "5701-11-19"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "7793-07-23"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "1120-04-21"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "4227-08-19"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "1806-01-16"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "1855-08-06"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "9303-08-28"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "9940-04-10"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "3911-12-18"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "0218-03-03"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "1271-10-14"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "0181-08-01"
+            }
+          ],
+          "element_type": "cal::local_date"
+        },
+        "QXCPZPZQOGPSMLQ": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::local_date",
+              "value": "1207-07-21"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "2267-02-22"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "9586-07-21"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "8910-06-25"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "1335-01-23"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "1428-09-29"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "6094-07-20"
+            }
+          ],
+          "element_type": "cal::local_date"
+        },
+        "GYFCGQIWHRKCDZD": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::datetime",
+              "value": "0196-09-15T23:02:35.518384-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "5199-07-25T18:35:12.048-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "5323-03-15T11:15:57.234032-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "7290-02-19T07:35:48.08336-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "7123-02-23T10:27:48.889792-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "7290-02-05T21:41:21.64896-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "2787-12-23T14:28:38.058564-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "8568-06-28T08:21:29.964736-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "0904-09-25T11:03:42.365428-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "9010-08-12T22:31:43.95312-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "9004-08-22T21:03:22.539232-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "0595-01-10T12:16:56.253896-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "3281-06-04T22:32:40.130736-03:00"
+            }
+          ],
+          "element_type": "std::datetime"
+        },
+        "TMFTQUNHQGVEUFA": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::datetime",
+              "value": "1027-11-10T23:02:15.743832-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "3937-09-30T04:22:16.400592-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "1291-04-23T01:37:19.25278-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "1139-05-10T11:56:01.5569-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "6229-03-07T02:08:36.04152-04:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "0772-05-08T22:33:31.277952-03:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "6312-03-31T16:50:19.687088-03:00"
+            }
+          ],
+          "element_type": "std::datetime"
+        },
+        "FXGESLVYDRQXGMT": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::str",
+              "value": "EKWGCXVZGQOKGXP"
+            },
+            {
+              "type": "std::str",
+              "value": "WJSUSAHWLGZQETT"
+            },
+            {
+              "type": "std::str",
+              "value": "FIBCXZQZMYHHMKR"
+            },
+            {
+              "type": "std::str",
+              "value": "EBIAKQWDDAVWXEV"
+            },
+            {
+              "type": "std::str",
+              "value": "XAFYWNTXTTIUTZJ"
+            },
+            {
+              "type": "std::str",
+              "value": "ODLDLSDOLXYWDUC"
+            },
+            {
+              "type": "std::str",
+              "value": "CUKLFTZQHKHRICK"
+            },
+            {
+              "type": "std::str",
+              "value": "QVHUSSBFXQMYOWT"
+            }
+          ],
+          "element_type": "std::str"
+        },
+        "RARZPXUUEUVALLG": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::int32",
+              "value": 1788867673
+            },
+            {
+              "type": "std::int32",
+              "value": 501663509
+            },
+            {
+              "type": "std::int32",
+              "value": 684486733
+            },
+            {
+              "type": "std::int32",
+              "value": 1026783342
+            },
+            {
+              "type": "std::int32",
+              "value": 649113076
+            },
+            {
+              "type": "std::int32",
+              "value": 1259912006
+            },
+            {
+              "type": "std::int32",
+              "value": 818774533
+            },
+            {
+              "type": "std::int32",
+              "value": 1559518480
+            },
+            {
+              "type": "std::int32",
+              "value": 410048249
+            },
+            {
+              "type": "std::int32",
+              "value": 1191994925
+            }
+          ],
+          "element_type": "std::int32"
+        },
+        "GABLRIAIKLNSAMP": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::float32",
+              "value": -16.327385
+            },
+            {
+              "type": "std::float32",
+              "value": -33.666264
+            },
+            {
+              "type": "std::float32",
+              "value": 21.176596
+            },
+            {
+              "type": "std::float32",
+              "value": 12.528958
+            },
+            {
+              "type": "std::float32",
+              "value": -15.134475
+            },
+            {
+              "type": "std::float32",
+              "value": 6.96607
+            },
+            {
+              "type": "std::float32",
+              "value": -13.232865
+            },
+            {
+              "type": "std::float32",
+              "value": -42.80559
+            },
+            {
+              "type": "std::float32",
+              "value": -1.9663128
+            },
+            {
+              "type": "std::float32",
+              "value": 28.918852
+            },
+            {
+              "type": "std::float32",
+              "value": -32.09169
+            },
+            {
+              "type": "std::float32",
+              "value": 4.675624
+            },
+            {
+              "type": "std::float32",
+              "value": -6.903943
+            },
+            {
+              "type": "std::float32",
+              "value": 18.24296
+            },
+            {
+              "type": "std::float32",
+              "value": 58.26846
+            },
+            {
+              "type": "std::float32",
+              "value": -1.7814349
+            },
+            {
+              "type": "std::float32",
+              "value": 75.03716
+            },
+            {
+              "type": "std::float32",
+              "value": -9.633287
+            }
+          ],
+          "element_type": "std::float32"
+        },
+        "ZKFKKDDNRTVOZGA": {
+          "type": "std::int16",
+          "value": 13589
+        },
+        "KPCHUBVWFENAFMZ": {
+          "type": "std::bytes",
+          "value": "MkUyN0c3WURMMEZKWEREMlQ3Mw=="
+        },
+        "PJFJJNFYQMLHVPF": {
+          "type": "std::float64",
+          "value": 3.2345481115554215
+        },
+        "MXAZVXOFDBTMHRB": {
+          "type": "cal::date_duration",
+          "value": "12812.00:00:00"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/111.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/111.json
new file mode 100644
index 0000000..81d4131
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/111.json
@@ -0,0 +1,473 @@
+{
+  "name": "Query result of type namedtuple<array<std::str>, array<std::float64>, array<std::int32>, array<std::decimal>, array<cal::local_time>, array<cal::local_time>, std::int16, std::bytes, std::float64, cal::date_duration, namedtuple<std::decimal, std::float64, std::bigint, std::json>, namedtuple<std::float64, std::bigint, std::json, std::decimal>, namedtuple<std::bigint, std::json, std::decimal, std::float64>, namedtuple<std::json, std::decimal, std::float64, std::bigint>, namedtuple<std::decimal, std::float64, std::bigint, std::json>, cal::local_time>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (KNQSSMVNWLBWZMA := ['FVZTTFODHBDEGCG', 'TJCVBOZSJQWPWJH', 'WCTQBUOUAFCKRDV', 'QNKGSJTRWGJDJYH', 'UMHEIPKZUHUVLOB', 'VBYIYAYNICTVKLL', 'YEQEWRLADLLKPXF', 'EEHHZZYTNUVFVOO', 'VSXGYWJEQYENPNX', 'XLQGDECYFXQBVFE', 'WBPXZZKIUDQBULE', 'WJIKXHGRQYAAFII'], TPQNYAMXBILANAE := [<float64>-39.30414844737581n, <float64>37.43195319195834n, <float64>-24.634062997826405n, <float64>-33.67462011877197n, <float64>38.44843513213491n, <float64>-4.614700364235183n, <float64>-3.242164022867644n, <float64>37.42717933581545n, <float64>49.72760051196795n, <float64>-8.06907428292049n, <float64>-7.016307514634127n, <float64>11.330581089169987n, <float64>-93.24880050413721n, <float64>-2.0211278293380177n, <float64>-42.5767029526535n, <float64>-22.552643370140643n], TAACPIOLLBTPURG := [<int32>1122438639, <int32>768654081, <int32>1956110851, <int32>1385045973, <int32>658960622, <int32>460205188, <int32>1498737058, <int32>2093202837, <int32>27230123, <int32>287377228, <int32>1027360214, <int32>928685419, <int32>1430492488, <int32>772006984, <int32>1872974049], VWTFFZVIDOXIBGB := [<std::decimal>43.29934063055521n, <std::decimal>20.12709347443984n, <std::decimal>34.061726367595458n, <std::decimal>3.227555646201390n, <std::decimal>9.885581381100044n, <std::decimal>0.065765069362598n, <std::decimal>53.797605919557430n], PYVMMVONONTIJXT := [<cal::local_time>'03:59:19.3801720', <cal::local_time>'20:56:53.1328520', <cal::local_time>'01:53:42.1874380', <cal::local_time>'06:51:45.9325940', <cal::local_time>'12:43:30.7183750', <cal::local_time>'17:15:09.7690310'], ZXCKQHCUEMMHGSU := [<cal::local_time>'10:56:01.2360080', <cal::local_time>'08:25:50.0855620', <cal::local_time>'06:26:59.7092260', <cal::local_time>'22:26:56.3089380', <cal::local_time>'17:28:16.2269060', <cal::local_time>'06:02:37.0266250', <cal::local_time>'05:13:45.3407500', <cal::local_time>'11:49:32.1884060', <cal::local_time>'14:50:29.4640350', <cal::local_time>'01:43:09.8642190', <cal::local_time>'02:11:16.2464380', <cal::local_time>'15:45:53.4002500', <cal::local_time>'18:22:27.5434360', <cal::local_time>'07:22:48.3118120', <cal::local_time>'10:59:33.2345620', <cal::local_time>'20:51:48.5211560'], NPTDXHKZDWKLVPJ := <int16>8759, EZZTNXXOOMGBDWQ := b'5GHBAGP1YLD3NJ', NLOKWVQARVPIUEY := <float64>1.1478192401806913n, ZKDFMZOGBEVCEHI := <cal::date_duration>'-23705 days', MUQFENFLVQOTIDA := (HUJGCKHOOVWSKBM := <std::decimal>14.616915426504288n, NZIUFQAADYSHWSC := <float64>-0n, JLBMBQIRMAUDCLW := <std::bigint>-113706657469493092545158n, ZEQRBYCZAMMGDWZ := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}')), ZJVPWZCBQNZQDJU := (FJJNWJSFZMWDOWI := <float64>-51.62428960745422n, XNGKABPAOYMVQSI := <std::bigint>-143230919n, QQQKDZNTEIWLHWR := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), YJLGJEGNQGKFVOD := <std::decimal>1.548524981620035n), GWQAWCCGJQQKIVR := (VEAKGLKCTXOHXQE := <std::bigint>1398330747461377667349n, VPXGXPOTSYHQEUM := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), HZNUITLCAMFWTXS := <std::decimal>14.250736676273284n, QUFMZZTDYFGSRVI := <float64>-52.5371045975653n), KUCEUGKJSAUGQLA := (SHUZOBEUFWHVKOY := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), FUVJNPLGPPADDZP := <std::decimal>18.276781791950016n, PMWNHIPHYYYPZDB := <float64>-0.5769353739809875n, RQCWOKYABRFGZFT := <std::bigint>-2496235954809000042674753206586419n), ZTSYAMPICJIOPSS := (KGEPFHJCXJLKGKI := <std::decimal>12.140331035545248n, GMHGSMWAQDEEQYU := <float64>21.406260831936383n, MIRKPBQAFCRAEPL := <std::bigint>-324444214025677446089n, STNQXVZLMVPCREC := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}')), QXYDZPEMPSLVZTC := <cal::local_time>'11:11:39.7535000')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "KNQSSMVNWLBWZMA": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::str",
+              "value": "FVZTTFODHBDEGCG"
+            },
+            {
+              "type": "std::str",
+              "value": "TJCVBOZSJQWPWJH"
+            },
+            {
+              "type": "std::str",
+              "value": "WCTQBUOUAFCKRDV"
+            },
+            {
+              "type": "std::str",
+              "value": "QNKGSJTRWGJDJYH"
+            },
+            {
+              "type": "std::str",
+              "value": "UMHEIPKZUHUVLOB"
+            },
+            {
+              "type": "std::str",
+              "value": "VBYIYAYNICTVKLL"
+            },
+            {
+              "type": "std::str",
+              "value": "YEQEWRLADLLKPXF"
+            },
+            {
+              "type": "std::str",
+              "value": "EEHHZZYTNUVFVOO"
+            },
+            {
+              "type": "std::str",
+              "value": "VSXGYWJEQYENPNX"
+            },
+            {
+              "type": "std::str",
+              "value": "XLQGDECYFXQBVFE"
+            },
+            {
+              "type": "std::str",
+              "value": "WBPXZZKIUDQBULE"
+            },
+            {
+              "type": "std::str",
+              "value": "WJIKXHGRQYAAFII"
+            }
+          ],
+          "element_type": "std::str"
+        },
+        "TPQNYAMXBILANAE": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::float64",
+              "value": -39.30414844737581
+            },
+            {
+              "type": "std::float64",
+              "value": 37.43195319195834
+            },
+            {
+              "type": "std::float64",
+              "value": -24.634062997826405
+            },
+            {
+              "type": "std::float64",
+              "value": -33.67462011877197
+            },
+            {
+              "type": "std::float64",
+              "value": 38.44843513213491
+            },
+            {
+              "type": "std::float64",
+              "value": -4.614700364235183
+            },
+            {
+              "type": "std::float64",
+              "value": -3.242164022867644
+            },
+            {
+              "type": "std::float64",
+              "value": 37.42717933581545
+            },
+            {
+              "type": "std::float64",
+              "value": 49.72760051196795
+            },
+            {
+              "type": "std::float64",
+              "value": -8.06907428292049
+            },
+            {
+              "type": "std::float64",
+              "value": -7.016307514634127
+            },
+            {
+              "type": "std::float64",
+              "value": 11.330581089169987
+            },
+            {
+              "type": "std::float64",
+              "value": -93.24880050413721
+            },
+            {
+              "type": "std::float64",
+              "value": -2.0211278293380177
+            },
+            {
+              "type": "std::float64",
+              "value": -42.5767029526535
+            },
+            {
+              "type": "std::float64",
+              "value": -22.552643370140643
+            }
+          ],
+          "element_type": "std::float64"
+        },
+        "TAACPIOLLBTPURG": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::int32",
+              "value": 1122438639
+            },
+            {
+              "type": "std::int32",
+              "value": 768654081
+            },
+            {
+              "type": "std::int32",
+              "value": 1956110851
+            },
+            {
+              "type": "std::int32",
+              "value": 1385045973
+            },
+            {
+              "type": "std::int32",
+              "value": 658960622
+            },
+            {
+              "type": "std::int32",
+              "value": 460205188
+            },
+            {
+              "type": "std::int32",
+              "value": 1498737058
+            },
+            {
+              "type": "std::int32",
+              "value": 2093202837
+            },
+            {
+              "type": "std::int32",
+              "value": 27230123
+            },
+            {
+              "type": "std::int32",
+              "value": 287377228
+            },
+            {
+              "type": "std::int32",
+              "value": 1027360214
+            },
+            {
+              "type": "std::int32",
+              "value": 928685419
+            },
+            {
+              "type": "std::int32",
+              "value": 1430492488
+            },
+            {
+              "type": "std::int32",
+              "value": 772006984
+            },
+            {
+              "type": "std::int32",
+              "value": 1872974049
+            }
+          ],
+          "element_type": "std::int32"
+        },
+        "VWTFFZVIDOXIBGB": {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::decimal",
+              "value": 43.29934063055521
+            },
+            {
+              "type": "std::decimal",
+              "value": 20.12709347443984
+            },
+            {
+              "type": "std::decimal",
+              "value": 34.061726367595458
+            },
+            {
+              "type": "std::decimal",
+              "value": 3.227555646201390
+            },
+            {
+              "type": "std::decimal",
+              "value": 9.885581381100044
+            },
+            {
+              "type": "std::decimal",
+              "value": 0.065765069362598
+            },
+            {
+              "type": "std::decimal",
+              "value": 53.797605919557430
+            }
+          ],
+          "element_type": "std::decimal"
+        },
+        "PYVMMVONONTIJXT": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::local_time",
+              "value": "03:59:19.3801720"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "20:56:53.1328520"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "01:53:42.1874380"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "06:51:45.9325940"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "12:43:30.7183750"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "17:15:09.7690310"
+            }
+          ],
+          "element_type": "cal::local_time"
+        },
+        "ZXCKQHCUEMMHGSU": {
+          "type": "array",
+          "value": [
+            {
+              "type": "cal::local_time",
+              "value": "10:56:01.2360080"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "08:25:50.0855620"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "06:26:59.7092260"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "22:26:56.3089380"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "17:28:16.2269060"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "06:02:37.0266250"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "05:13:45.3407500"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "11:49:32.1884060"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "14:50:29.4640350"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "01:43:09.8642190"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "02:11:16.2464380"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "15:45:53.4002500"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "18:22:27.5434360"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "07:22:48.3118120"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "10:59:33.2345620"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "20:51:48.5211560"
+            }
+          ],
+          "element_type": "cal::local_time"
+        },
+        "NPTDXHKZDWKLVPJ": {
+          "type": "std::int16",
+          "value": 8759
+        },
+        "EZZTNXXOOMGBDWQ": {
+          "type": "std::bytes",
+          "value": "NUdIQkFHUDFZTEQzTko="
+        },
+        "NLOKWVQARVPIUEY": {
+          "type": "std::float64",
+          "value": 1.1478192401806913
+        },
+        "ZKDFMZOGBEVCEHI": {
+          "type": "cal::date_duration",
+          "value": "-23705.00:00:00"
+        },
+        "MUQFENFLVQOTIDA": {
+          "type": "namedtuple",
+          "value": {
+            "HUJGCKHOOVWSKBM": {
+              "type": "std::decimal",
+              "value": 14.616915426504288
+            },
+            "NZIUFQAADYSHWSC": {
+              "type": "std::float64",
+              "value": 0.0
+            },
+            "JLBMBQIRMAUDCLW": {
+              "type": "std::bigint",
+              "value": -113706657469493092545158
+            },
+            "ZEQRBYCZAMMGDWZ": {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            }
+          }
+        },
+        "ZJVPWZCBQNZQDJU": {
+          "type": "namedtuple",
+          "value": {
+            "FJJNWJSFZMWDOWI": {
+              "type": "std::float64",
+              "value": -51.62428960745422
+            },
+            "XNGKABPAOYMVQSI": {
+              "type": "std::bigint",
+              "value": -143230919
+            },
+            "QQQKDZNTEIWLHWR": {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            "YJLGJEGNQGKFVOD": {
+              "type": "std::decimal",
+              "value": 1.548524981620035
+            }
+          }
+        },
+        "GWQAWCCGJQQKIVR": {
+          "type": "namedtuple",
+          "value": {
+            "VEAKGLKCTXOHXQE": {
+              "type": "std::bigint",
+              "value": 1398330747461377667349
+            },
+            "VPXGXPOTSYHQEUM": {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            "HZNUITLCAMFWTXS": {
+              "type": "std::decimal",
+              "value": 14.250736676273284
+            },
+            "QUFMZZTDYFGSRVI": {
+              "type": "std::float64",
+              "value": -52.5371045975653
+            }
+          }
+        },
+        "KUCEUGKJSAUGQLA": {
+          "type": "namedtuple",
+          "value": {
+            "SHUZOBEUFWHVKOY": {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            "FUVJNPLGPPADDZP": {
+              "type": "std::decimal",
+              "value": 18.276781791950016
+            },
+            "PMWNHIPHYYYPZDB": {
+              "type": "std::float64",
+              "value": -0.5769353739809875
+            },
+            "RQCWOKYABRFGZFT": {
+              "type": "std::bigint",
+              "value": -2496235954809000042674753206586419
+            }
+          }
+        },
+        "ZTSYAMPICJIOPSS": {
+          "type": "namedtuple",
+          "value": {
+            "KGEPFHJCXJLKGKI": {
+              "type": "std::decimal",
+              "value": 12.140331035545248
+            },
+            "GMHGSMWAQDEEQYU": {
+              "type": "std::float64",
+              "value": 21.406260831936383
+            },
+            "MIRKPBQAFCRAEPL": {
+              "type": "std::bigint",
+              "value": -324444214025677446089
+            },
+            "STNQXVZLMVPCREC": {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            }
+          }
+        },
+        "QXYDZPEMPSLVZTC": {
+          "type": "cal::local_time",
+          "value": "11:11:39.7535000"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/112.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/112.json
new file mode 100644
index 0000000..b70c0ca
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/112.json
@@ -0,0 +1,28 @@
+{
+  "name": "Query result of type object<std::str>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { SIXMPFWBTCQWCYZ := 'HCHSCXDOBBEJDLT' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "object",
+      "value": {
+        "SIXMPFWBTCQWCYZ": {
+          "type": "std::str",
+          "value": "HCHSCXDOBBEJDLT"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/113.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/113.json
new file mode 100644
index 0000000..a4e454c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/113.json
@@ -0,0 +1,36 @@
+{
+  "name": "Query result of type object<std::datetime, std::uuid, cal::local_date>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { PYZWEYBSCBGMOPM := <datetime>'7578-07-06T20:54:09.489536-03:00', KSRUHBUFJLOAMXI := <uuid>'6268e1e2-2dd7-b039-9419-8a9d4ece0139', KWSTCYIXEQVNNRP := <cal::local_date>'1594-09-01' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "object",
+      "value": {
+        "PYZWEYBSCBGMOPM": {
+          "type": "std::datetime",
+          "value": "7578-07-06T20:54:09.489536-03:00"
+        },
+        "KSRUHBUFJLOAMXI": {
+          "type": "std::uuid",
+          "value": "6268e1e2-2dd7-b039-9419-8a9d4ece0139"
+        },
+        "KWSTCYIXEQVNNRP": {
+          "type": "cal::local_date",
+          "value": "1594-09-01"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/114.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/114.json
new file mode 100644
index 0000000..66e5dcd
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/114.json
@@ -0,0 +1,36 @@
+{
+  "name": "Query result of type object<std::uuid, cal::local_date, std::datetime>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { CQIIUJDKQFQADNJ := <uuid>'2b3a0f37-ec19-ce1c-1f3b-8eb109474cd4', WTOJDFQMOJLSRWB := <cal::local_date>'1101-03-26', NOBZZIVRKBAXTOD := <datetime>'2752-12-25T04:22:13.777624-04:00' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "object",
+      "value": {
+        "CQIIUJDKQFQADNJ": {
+          "type": "std::uuid",
+          "value": "2b3a0f37-ec19-ce1c-1f3b-8eb109474cd4"
+        },
+        "WTOJDFQMOJLSRWB": {
+          "type": "cal::local_date",
+          "value": "1101-03-26"
+        },
+        "NOBZZIVRKBAXTOD": {
+          "type": "std::datetime",
+          "value": "2752-12-25T04:22:13.777624-04:00"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/115.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/115.json
new file mode 100644
index 0000000..0520ceb
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/115.json
@@ -0,0 +1,36 @@
+{
+  "name": "Query result of type object<cal::local_date, std::datetime, std::uuid>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { DJZZWTZDQGVGGKS := <cal::local_date>'3596-09-08', HYWBXKSRTDPPVUH := <datetime>'4529-08-05T09:50:16.077472-03:00', SSDMQUBVJCALDRI := <uuid>'a51f3128-04a1-b73f-cb51-37bf0a8d1f66' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "object",
+      "value": {
+        "DJZZWTZDQGVGGKS": {
+          "type": "cal::local_date",
+          "value": "3596-09-08"
+        },
+        "HYWBXKSRTDPPVUH": {
+          "type": "std::datetime",
+          "value": "4529-08-05T09:50:16.077472-03:00"
+        },
+        "SSDMQUBVJCALDRI": {
+          "type": "std::uuid",
+          "value": "a51f3128-04a1-b73f-cb51-37bf0a8d1f66"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/116.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/116.json
new file mode 100644
index 0000000..c6421b8
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/116.json
@@ -0,0 +1,29 @@
+{
+  "name": "Query result of type range<cal::local_date>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT range(<cal::local_date>'5057-01-18', <cal::local_date>'7932-05-23')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": "5057-01-18",
+        "upper": "7932-05-23",
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "cal::local_date"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/117.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/117.json
new file mode 100644
index 0000000..f605a27
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/117.json
@@ -0,0 +1,29 @@
+{
+  "name": "Query result of type range<std::int32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT range(<int32>352319336, <int32>1441340038)",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": 352319336,
+        "upper": 1441340038,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::int32"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/118.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/118.json
new file mode 100644
index 0000000..91b2a18
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/118.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type cal::relative_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::relative_duration>'0 seconds'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::relative_duration",
+      "value": "00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/119.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/119.json
new file mode 100644
index 0000000..f0ed161
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/119.json
@@ -0,0 +1,47 @@
+{
+  "name": "Query result of type set<std::int16>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <int16>14530, <int16>21454, <int16>5212, <int16>27287, <int16>7624, <int16>18218 }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "std::int16",
+        "value": 14530
+      },
+      {
+        "type": "std::int16",
+        "value": 21454
+      },
+      {
+        "type": "std::int16",
+        "value": 5212
+      },
+      {
+        "type": "std::int16",
+        "value": 27287
+      },
+      {
+        "type": "std::int16",
+        "value": 7624
+      },
+      {
+        "type": "std::int16",
+        "value": 18218
+      }
+    ],
+    "element_type": "std::int16"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/12.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/12.json
new file mode 100644
index 0000000..a9d0ed4
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/12.json
@@ -0,0 +1,93 @@
+{
+  "name": "Query result of type array<std::bool>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [true, true, true, true, true, false, true, false, false, true, true, true, true, true, false, false, false]",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": false
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": false
+        },
+        {
+          "type": "std::bool",
+          "value": false
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": false
+        },
+        {
+          "type": "std::bool",
+          "value": false
+        },
+        {
+          "type": "std::bool",
+          "value": false
+        }
+      ],
+      "element_type": "std::bool"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/120.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/120.json
new file mode 100644
index 0000000..e69809c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/120.json
@@ -0,0 +1,55 @@
+{
+  "name": "Query result of type set<cal::relative_duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <cal::relative_duration>'5875200 seconds', <cal::relative_duration>'2160000 seconds', <cal::relative_duration>'5097600 seconds', <cal::relative_duration>'4060800 seconds', <cal::relative_duration>'2505600 seconds', <cal::relative_duration>'259200 seconds', <cal::relative_duration>'259200 seconds', <cal::relative_duration>'4320000 seconds' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "cal::relative_duration",
+        "value": "68.00:00:00"
+      },
+      {
+        "type": "cal::relative_duration",
+        "value": "25.00:00:00"
+      },
+      {
+        "type": "cal::relative_duration",
+        "value": "59.00:00:00"
+      },
+      {
+        "type": "cal::relative_duration",
+        "value": "47.00:00:00"
+      },
+      {
+        "type": "cal::relative_duration",
+        "value": "29.00:00:00"
+      },
+      {
+        "type": "cal::relative_duration",
+        "value": "3.00:00:00"
+      },
+      {
+        "type": "cal::relative_duration",
+        "value": "3.00:00:00"
+      },
+      {
+        "type": "cal::relative_duration",
+        "value": "50.00:00:00"
+      }
+    ],
+    "element_type": "cal::relative_duration"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/121.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/121.json
new file mode 100644
index 0000000..7e0b8bf
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/121.json
@@ -0,0 +1,63 @@
+{
+  "name": "Query result of type set<range<std::int64>>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { range(<std::int64>4539650887878041736, <std::int64>6038405025612454648), range(<std::int64>5860146886327473512, <std::int64>8960119331412300426), range(<std::int64>2987674829276058012, <std::int64>6252212801466660762), range(<std::int64>505428471966870839, <std::int64>938535493624214885) }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "range",
+        "value": {
+          "lower": 4539650887878041736,
+          "upper": 6038405025612454648,
+          "inc_lower": true,
+          "inc_upper": false
+        },
+        "element_type": "std::int64"
+      },
+      {
+        "type": "range",
+        "value": {
+          "lower": 5860146886327473512,
+          "upper": 8960119331412300426,
+          "inc_lower": true,
+          "inc_upper": false
+        },
+        "element_type": "std::int64"
+      },
+      {
+        "type": "range",
+        "value": {
+          "lower": 2987674829276058012,
+          "upper": 6252212801466660762,
+          "inc_lower": true,
+          "inc_upper": false
+        },
+        "element_type": "std::int64"
+      },
+      {
+        "type": "range",
+        "value": {
+          "lower": 505428471966870839,
+          "upper": 938535493624214885,
+          "inc_lower": true,
+          "inc_upper": false
+        },
+        "element_type": "std::int64"
+      }
+    ],
+    "element_type": "range"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/122.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/122.json
new file mode 100644
index 0000000..b0f5855
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/122.json
@@ -0,0 +1,67 @@
+{
+  "name": "Query result of type set<std::bigint>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <std::bigint>21711328442934322962313246685n, <std::bigint>1582239973508709188609660283593903n, <std::bigint>-1612086349429897n, <std::bigint>-3301933424n, <std::bigint>413718196669n, <std::bigint>-1422902068058816445448963305361073n, <std::bigint>444365628701n, <std::bigint>545148136n, <std::bigint>-451257030281891528645507235948949n, <std::bigint>-10749411252903308298887642554n, <std::bigint>1317679960088146896842n }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "std::bigint",
+        "value": 21711328442934322962313246685
+      },
+      {
+        "type": "std::bigint",
+        "value": 1582239973508709188609660283593903
+      },
+      {
+        "type": "std::bigint",
+        "value": -1612086349429897
+      },
+      {
+        "type": "std::bigint",
+        "value": -3301933424
+      },
+      {
+        "type": "std::bigint",
+        "value": 413718196669
+      },
+      {
+        "type": "std::bigint",
+        "value": -1422902068058816445448963305361073
+      },
+      {
+        "type": "std::bigint",
+        "value": 444365628701
+      },
+      {
+        "type": "std::bigint",
+        "value": 545148136
+      },
+      {
+        "type": "std::bigint",
+        "value": -451257030281891528645507235948949
+      },
+      {
+        "type": "std::bigint",
+        "value": -10749411252903308298887642554
+      },
+      {
+        "type": "std::bigint",
+        "value": 1317679960088146896842
+      }
+    ],
+    "element_type": "std::bigint"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/123.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/123.json
new file mode 100644
index 0000000..7aa13f4
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/123.json
@@ -0,0 +1,59 @@
+{
+  "name": "Query result of type set<cal::local_datetime>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <cal::local_datetime>'1236-09-12T17:22:59.680188', <cal::local_datetime>'4603-09-10T15:24:36.017408', <cal::local_datetime>'2403-10-28T20:57:55.056108', <cal::local_datetime>'9819-08-13T19:01:45.775936', <cal::local_datetime>'1100-01-14T20:35:37.459876', <cal::local_datetime>'4478-06-29T07:21:44.133376', <cal::local_datetime>'1085-06-13T03:19:13.820896', <cal::local_datetime>'5635-02-24T03:02:45.797664', <cal::local_datetime>'1857-10-14T20:19:02.495515' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "cal::local_datetime",
+        "value": "1236-09-12T17:22:59.6801880"
+      },
+      {
+        "type": "cal::local_datetime",
+        "value": "4603-09-10T15:24:36.0174080"
+      },
+      {
+        "type": "cal::local_datetime",
+        "value": "2403-10-28T20:57:55.0561080"
+      },
+      {
+        "type": "cal::local_datetime",
+        "value": "9819-08-13T19:01:45.7759360"
+      },
+      {
+        "type": "cal::local_datetime",
+        "value": "1100-01-14T20:35:37.4598760"
+      },
+      {
+        "type": "cal::local_datetime",
+        "value": "4478-06-29T07:21:44.1333760"
+      },
+      {
+        "type": "cal::local_datetime",
+        "value": "1085-06-13T03:19:13.8208960"
+      },
+      {
+        "type": "cal::local_datetime",
+        "value": "5635-02-24T03:02:45.7976640"
+      },
+      {
+        "type": "cal::local_datetime",
+        "value": "1857-10-14T20:19:02.4955150"
+      }
+    ],
+    "element_type": "cal::local_datetime"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/124.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/124.json
new file mode 100644
index 0000000..53cd887
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/124.json
@@ -0,0 +1,47 @@
+{
+  "name": "Query result of type set<std::uuid>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <uuid>'79256ee6-6373-2424-00cc-814b7ca8035f', <uuid>'2200c460-126e-16fe-a6f1-ec5854ce683a', <uuid>'5c1350c3-6b42-f1ad-7a56-6d7b2ae19c28', <uuid>'73269206-5e10-d41d-6f0e-d28176cbcf32', <uuid>'2b874763-a695-f51d-170e-a818a483ebc4', <uuid>'c252c354-f4a8-642a-333e-ed33992b7aae' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "std::uuid",
+        "value": "79256ee6-6373-2424-00cc-814b7ca8035f"
+      },
+      {
+        "type": "std::uuid",
+        "value": "2200c460-126e-16fe-a6f1-ec5854ce683a"
+      },
+      {
+        "type": "std::uuid",
+        "value": "5c1350c3-6b42-f1ad-7a56-6d7b2ae19c28"
+      },
+      {
+        "type": "std::uuid",
+        "value": "73269206-5e10-d41d-6f0e-d28176cbcf32"
+      },
+      {
+        "type": "std::uuid",
+        "value": "2b874763-a695-f51d-170e-a818a483ebc4"
+      },
+      {
+        "type": "std::uuid",
+        "value": "c252c354-f4a8-642a-333e-ed33992b7aae"
+      }
+    ],
+    "element_type": "std::uuid"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/125.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/125.json
new file mode 100644
index 0000000..1e15d12
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/125.json
@@ -0,0 +1,59 @@
+{
+  "name": "Query result of type set<cal::date_duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <cal::date_duration>'-23697 days', <cal::date_duration>'-8262 days', <cal::date_duration>'-32008 days', <cal::date_duration>'-1876 days', <cal::date_duration>'3398 days', <cal::date_duration>'20090 days', <cal::date_duration>'-23211 days', <cal::date_duration>'-32651 days', <cal::date_duration>'24925 days' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "cal::date_duration",
+        "value": "-23697.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-8262.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-32008.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-1876.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "3398.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "20090.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-23211.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-32651.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "24925.00:00:00"
+      }
+    ],
+    "element_type": "cal::date_duration"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/126.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/126.json
new file mode 100644
index 0000000..15c1bda
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/126.json
@@ -0,0 +1,475 @@
+{
+  "name": "Query result of type set<set<std::datetime>>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { { <datetime>'6270-05-26T07:24:05.69912-03:00', <datetime>'0843-12-29T17:42:15.61264-04:00', <datetime>'4253-11-24T21:10:27.94336-04:00' }, { <datetime>'1202-12-19T21:58:45.969484-04:00', <datetime>'1075-02-17T10:26:18.388704-04:00', <datetime>'5619-03-19T18:16:43.89872-03:00', <datetime>'5816-03-13T02:12:17.504416-03:00', <datetime>'4873-03-30T00:15:50.19344-03:00', <datetime>'2465-11-14T04:11:43.403546-04:00', <datetime>'3679-12-12T02:07:52.480496-04:00', <datetime>'7372-07-21T03:37:49.590528-03:00', <datetime>'2336-06-12T16:48:16.49478-03:00', <datetime>'2386-05-03T01:12:56.042124-03:00', <datetime>'6840-11-19T10:37:40.490784-04:00', <datetime>'8294-08-07T11:33:42.261952-03:00', <datetime>'5299-08-27T07:11:30.565088-03:00', <datetime>'7838-10-20T11:02:53.261376-03:00', <datetime>'8289-07-05T16:50:40.697248-03:00', <datetime>'4458-09-12T21:26:49.64264-03:00', <datetime>'0986-06-03T23:45:45.22942-03:00', <datetime>'2944-08-30T05:58:10.60064-03:00' }, { <datetime>'8382-10-09T12:21:26.699136-03:00', <datetime>'7588-05-15T05:49:15.293184-03:00', <datetime>'9287-05-28T05:21:09.526816-03:00', <datetime>'9438-07-23T21:53:37.929888-03:00', <datetime>'1877-04-18T01:15:24.184351-03:00', <datetime>'1137-12-08T02:14:14.680836-04:00', <datetime>'8448-05-23T13:13:43.218368-03:00', <datetime>'3465-04-28T21:10:27.621624-03:00', <datetime>'7492-02-19T00:10:50.50848-04:00', <datetime>'4380-07-28T23:08:45.183456-03:00', <datetime>'9396-06-06T21:26:17.302336-03:00', <datetime>'7380-07-13T20:03:03.912256-03:00', <datetime>'6389-06-24T09:51:25.747296-03:00', <datetime>'1797-09-21T21:45:22.190656-03:00', <datetime>'3263-05-15T01:35:54.650224-03:00', <datetime>'8648-01-10T13:59:30.978304-04:00', <datetime>'8694-05-01T23:11:32.185472-03:00', <datetime>'5731-10-10T03:01:06.941216-03:00', <datetime>'4757-07-18T07:34:09.413568-03:00' }, { <datetime>'8572-01-22T23:19:39.524192-04:00', <datetime>'2935-07-02T06:26:05.63372-03:00', <datetime>'8759-03-26T22:51:07.16416-03:00', <datetime>'5005-08-21T06:50:44.052656-03:00', <datetime>'4698-09-01T12:40:21.26352-03:00', <datetime>'0688-08-26T22:54:35.01296-03:00', <datetime>'1671-04-06T09:35:54.590702-03:00', <datetime>'6727-05-28T11:57:41.6432-03:00', <datetime>'9768-06-15T07:25:42.06976-03:00', <datetime>'0856-03-02T09:16:26.289936-04:00', <datetime>'9494-07-04T01:49:58.814624-03:00' }, { <datetime>'3326-09-27T01:25:55.098504-03:00', <datetime>'1421-09-28T17:21:47.7458-03:00', <datetime>'5871-02-15T08:49:01.244208-04:00', <datetime>'1671-07-09T15:14:07.18143-03:00', <datetime>'1915-07-24T16:37:36.442656-03:00', <datetime>'1636-07-26T12:32:40.458836-03:00', <datetime>'3742-12-02T17:01:19.714344-04:00', <datetime>'4679-04-06T23:58:02.823568-03:00', <datetime>'6424-11-05T11:02:06.975104-04:00', <datetime>'9000-07-18T07:01:15.781952-03:00', <datetime>'6187-10-23T01:57:01.972016-03:00', <datetime>'2992-12-24T04:29:04.40708-04:00', <datetime>'2940-01-04T19:21:59.1925-04:00', <datetime>'5005-10-19T05:09:52.129872-03:00', <datetime>'0452-05-29T00:46:14.743472-03:00', <datetime>'6497-11-15T13:48:20.071264-04:00', <datetime>'2037-04-15T05:35:35.914852-03:00', <datetime>'9190-10-09T21:03:22.283072-03:00' }, { <datetime>'8726-12-04T18:25:42.701408-04:00', <datetime>'6228-11-16T16:11:35.815888-04:00', <datetime>'7733-09-13T16:18:49.8992-03:00', <datetime>'0851-03-11T01:00:48.342672-04:00', <datetime>'5448-04-10T05:55:21.065408-03:00', <datetime>'8829-02-18T06:58:08.129024-04:00', <datetime>'4282-10-08T22:30:25.474176-03:00', <datetime>'4740-11-22T09:13:16.666336-04:00', <datetime>'1189-08-23T02:20:49.171392-03:00', <datetime>'9466-09-01T16:38:20.090112-03:00', <datetime>'1721-12-29T01:16:01.575141-04:00', <datetime>'3696-11-11T13:44:45.551848-04:00', <datetime>'6636-12-19T14:54:24.218528-04:00', <datetime>'4886-01-23T21:18:46.3688-04:00', <datetime>'0358-07-11T19:38:56.305632-03:00', <datetime>'4054-10-18T18:37:08.813784-03:00', <datetime>'4968-09-26T16:29:38.001536-03:00', <datetime>'5926-08-07T12:56:20.946432-03:00', <datetime>'1592-11-06T10:21:47.468796-04:00' }, { <datetime>'7058-10-07T10:38:51.726624-03:00', <datetime>'1989-11-08T09:59:47.226867-04:00', <datetime>'0079-04-13T07:36:06.589976-03:00', <datetime>'8786-02-09T02:37:13.726336-04:00', <datetime>'9571-07-07T16:18:23.742272-03:00', <datetime>'6747-09-09T04:29:03.661696-03:00', <datetime>'5767-04-02T18:22:02.757088-03:00', <datetime>'2066-08-17T11:28:44.860164-03:00', <datetime>'9692-11-12T07:30:29.133664-04:00', <datetime>'0237-03-31T22:08:20.269488-04:00', <datetime>'5173-05-20T19:47:34.519376-03:00', <datetime>'4691-02-12T06:22:05.728368-04:00', <datetime>'0578-09-07T10:22:19.786704-03:00', <datetime>'1260-12-27T15:37:17.778156-04:00' }, { <datetime>'2811-01-13T09:35:45.180764-04:00', <datetime>'5593-01-12T09:07:05.199248-04:00', <datetime>'0571-07-21T16:20:59.40312-03:00', <datetime>'0423-11-08T02:53:40.178808-04:00' }, { <datetime>'7632-10-13T18:07:10.968512-03:00', <datetime>'6895-09-03T03:19:23.792512-03:00', <datetime>'2554-04-12T14:40:30.542954-03:00', <datetime>'5212-08-04T07:19:42.73344-03:00', <datetime>'4703-11-10T09:46:05.399936-04:00', <datetime>'5304-09-05T17:16:30.230064-03:00', <datetime>'9550-11-03T11:02:37.753504-03:00' } }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "std::datetime",
+        "value": "6270-05-26T07:24:05.69912-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "0843-12-29T17:42:15.61264-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "4253-11-24T21:10:27.94336-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "1202-12-19T21:58:45.969484-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "1075-02-17T10:26:18.388704-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "5619-03-19T18:16:43.89872-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "5816-03-13T02:12:17.504416-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "4873-03-30T00:15:50.19344-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "2465-11-14T04:11:43.403546-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "3679-12-12T02:07:52.480496-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "7372-07-21T03:37:49.590528-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "2336-06-12T16:48:16.49478-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "2386-05-03T01:12:56.042124-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "6840-11-19T10:37:40.490784-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "8294-08-07T11:33:42.261952-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "5299-08-27T07:11:30.565088-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "7838-10-20T11:02:53.261376-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "8289-07-05T16:50:40.697248-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "4458-09-12T21:26:49.64264-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "0986-06-03T23:45:45.22942-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "2944-08-30T05:58:10.60064-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "8382-10-09T12:21:26.699136-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "7588-05-15T05:49:15.293184-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "9287-05-28T05:21:09.526816-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "9438-07-23T21:53:37.929888-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "1877-04-18T01:15:24.184351-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "1137-12-08T02:14:14.680836-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "8448-05-23T13:13:43.218368-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "3465-04-28T21:10:27.621624-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "7492-02-19T00:10:50.50848-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "4380-07-28T23:08:45.183456-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "9396-06-06T21:26:17.302336-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "7380-07-13T20:03:03.912256-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "6389-06-24T09:51:25.747296-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "1797-09-21T21:45:22.190656-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "3263-05-15T01:35:54.650224-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "8648-01-10T13:59:30.978304-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "8694-05-01T23:11:32.185472-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "5731-10-10T03:01:06.941216-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "4757-07-18T07:34:09.413568-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "8572-01-22T23:19:39.524192-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "2935-07-02T06:26:05.63372-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "8759-03-26T22:51:07.16416-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "5005-08-21T06:50:44.052656-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "4698-09-01T12:40:21.26352-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "0688-08-26T22:54:35.01296-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "1671-04-06T09:35:54.590702-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "6727-05-28T11:57:41.6432-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "9768-06-15T07:25:42.06976-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "0856-03-02T09:16:26.289936-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "9494-07-04T01:49:58.814624-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "3326-09-27T01:25:55.098504-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "1421-09-28T17:21:47.7458-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "5871-02-15T08:49:01.244208-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "1671-07-09T15:14:07.18143-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "1915-07-24T16:37:36.442656-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "1636-07-26T12:32:40.458836-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "3742-12-02T17:01:19.714344-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "4679-04-06T23:58:02.823568-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "6424-11-05T11:02:06.975104-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "9000-07-18T07:01:15.781952-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "6187-10-23T01:57:01.972016-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "2992-12-24T04:29:04.40708-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "2940-01-04T19:21:59.1925-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "5005-10-19T05:09:52.129872-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "0452-05-29T00:46:14.743472-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "6497-11-15T13:48:20.071264-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "2037-04-15T05:35:35.914852-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "9190-10-09T21:03:22.283072-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "8726-12-04T18:25:42.701408-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "6228-11-16T16:11:35.815888-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "7733-09-13T16:18:49.8992-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "0851-03-11T01:00:48.342672-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "5448-04-10T05:55:21.065408-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "8829-02-18T06:58:08.129024-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "4282-10-08T22:30:25.474176-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "4740-11-22T09:13:16.666336-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "1189-08-23T02:20:49.171392-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "9466-09-01T16:38:20.090112-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "1721-12-29T01:16:01.575141-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "3696-11-11T13:44:45.551848-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "6636-12-19T14:54:24.218528-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "4886-01-23T21:18:46.3688-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "0358-07-11T19:38:56.305632-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "4054-10-18T18:37:08.813784-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "4968-09-26T16:29:38.001536-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "5926-08-07T12:56:20.946432-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "1592-11-06T10:21:47.468796-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "7058-10-07T10:38:51.726624-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "1989-11-08T09:59:47.226867-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "0079-04-13T07:36:06.589976-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "8786-02-09T02:37:13.726336-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "9571-07-07T16:18:23.742272-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "6747-09-09T04:29:03.661696-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "5767-04-02T18:22:02.757088-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "2066-08-17T11:28:44.860164-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "9692-11-12T07:30:29.133664-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "0237-03-31T22:08:20.269488-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "5173-05-20T19:47:34.519376-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "4691-02-12T06:22:05.728368-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "0578-09-07T10:22:19.786704-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "1260-12-27T15:37:17.778156-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "2811-01-13T09:35:45.180764-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "5593-01-12T09:07:05.199248-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "0571-07-21T16:20:59.40312-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "0423-11-08T02:53:40.178808-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "7632-10-13T18:07:10.968512-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "6895-09-03T03:19:23.792512-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "2554-04-12T14:40:30.542954-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "5212-08-04T07:19:42.73344-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "4703-11-10T09:46:05.399936-04:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "5304-09-05T17:16:30.230064-03:00"
+      },
+      {
+        "type": "std::datetime",
+        "value": "9550-11-03T11:02:37.753504-03:00"
+      }
+    ],
+    "element_type": "std::datetime"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/127.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/127.json
new file mode 100644
index 0000000..5a8fc43
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/127.json
@@ -0,0 +1,87 @@
+{
+  "name": "Query result of type set<std::str>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { 'COBBGGRPXDWHFNC', 'SINKTWLOWXAYMKL', 'TYWMLLVWKRRYEZO', 'ECTFKKNGCNEIGSD', 'SDOHQQZHMRACENJ', 'JVUKQFHJLQJYGMQ', 'NEFALGOODMSTKKB', 'DHZKYTVMWEVAGAA', 'AIOAHJLCHGHDMOZ', 'OTVZNFSUITEGLOH', 'MSSBWBIUVWDSLSA', 'FULMEBNUPTROEFR', 'YERUVXEMLBEQCAI', 'TWBQCUXLEXLDKTP', 'FKTHAFMHQYADWWS', 'KAVHDAQDGGPXMBC' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "std::str",
+        "value": "COBBGGRPXDWHFNC"
+      },
+      {
+        "type": "std::str",
+        "value": "SINKTWLOWXAYMKL"
+      },
+      {
+        "type": "std::str",
+        "value": "TYWMLLVWKRRYEZO"
+      },
+      {
+        "type": "std::str",
+        "value": "ECTFKKNGCNEIGSD"
+      },
+      {
+        "type": "std::str",
+        "value": "SDOHQQZHMRACENJ"
+      },
+      {
+        "type": "std::str",
+        "value": "JVUKQFHJLQJYGMQ"
+      },
+      {
+        "type": "std::str",
+        "value": "NEFALGOODMSTKKB"
+      },
+      {
+        "type": "std::str",
+        "value": "DHZKYTVMWEVAGAA"
+      },
+      {
+        "type": "std::str",
+        "value": "AIOAHJLCHGHDMOZ"
+      },
+      {
+        "type": "std::str",
+        "value": "OTVZNFSUITEGLOH"
+      },
+      {
+        "type": "std::str",
+        "value": "MSSBWBIUVWDSLSA"
+      },
+      {
+        "type": "std::str",
+        "value": "FULMEBNUPTROEFR"
+      },
+      {
+        "type": "std::str",
+        "value": "YERUVXEMLBEQCAI"
+      },
+      {
+        "type": "std::str",
+        "value": "TWBQCUXLEXLDKTP"
+      },
+      {
+        "type": "std::str",
+        "value": "FKTHAFMHQYADWWS"
+      },
+      {
+        "type": "std::str",
+        "value": "KAVHDAQDGGPXMBC"
+      }
+    ],
+    "element_type": "std::str"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/128.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/128.json
new file mode 100644
index 0000000..0538051
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/128.json
@@ -0,0 +1,79 @@
+{
+  "name": "Query result of type set<std::bool>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { false, false, false, true, true, true, false, false, false, false, true, true, true, false }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "std::bool",
+        "value": false
+      },
+      {
+        "type": "std::bool",
+        "value": false
+      },
+      {
+        "type": "std::bool",
+        "value": false
+      },
+      {
+        "type": "std::bool",
+        "value": true
+      },
+      {
+        "type": "std::bool",
+        "value": true
+      },
+      {
+        "type": "std::bool",
+        "value": true
+      },
+      {
+        "type": "std::bool",
+        "value": false
+      },
+      {
+        "type": "std::bool",
+        "value": false
+      },
+      {
+        "type": "std::bool",
+        "value": false
+      },
+      {
+        "type": "std::bool",
+        "value": false
+      },
+      {
+        "type": "std::bool",
+        "value": true
+      },
+      {
+        "type": "std::bool",
+        "value": true
+      },
+      {
+        "type": "std::bool",
+        "value": true
+      },
+      {
+        "type": "std::bool",
+        "value": false
+      }
+    ],
+    "element_type": "std::bool"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/129.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/129.json
new file mode 100644
index 0000000..e037781
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/129.json
@@ -0,0 +1,71 @@
+{
+  "name": "Query result of type set<std::json>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}') }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      },
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      },
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      },
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      },
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      },
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      },
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      },
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      },
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      },
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      },
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      },
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      }
+    ],
+    "element_type": "std::json"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/13.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/13.json
new file mode 100644
index 0000000..7a89a21
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/13.json
@@ -0,0 +1,61 @@
+{
+  "name": "Query result of type array<std::bool>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [true, false, true, true, true, false, true, true, false]",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": false
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": false
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bool",
+          "value": false
+        }
+      ],
+      "element_type": "std::bool"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/130.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/130.json
new file mode 100644
index 0000000..c55c364
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/130.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::str",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT 'FWSJYHMEUPBTPOU'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::str",
+      "value": "FWSJYHMEUPBTPOU"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/131.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/131.json
new file mode 100644
index 0000000..312c20a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/131.json
@@ -0,0 +1,32 @@
+{
+  "name": "Query result of type tuple<cal::local_datetime, std::json>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (<cal::local_datetime>'5813-12-21T19:16:50.920032', std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'))",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "tuple",
+      "value": [
+        {
+          "type": "cal::local_datetime",
+          "value": "5813-12-21T19:16:50.9200320"
+        },
+        {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/132.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/132.json
new file mode 100644
index 0000000..0e89128
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/132.json
@@ -0,0 +1,32 @@
+{
+  "name": "Query result of type tuple<std::json, cal::local_datetime>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), <cal::local_datetime>'8515-03-17T07:38:26.406336')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "tuple",
+      "value": [
+        {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        },
+        {
+          "type": "cal::local_datetime",
+          "value": "8515-03-17T07:38:26.4063360"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/133.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/133.json
new file mode 100644
index 0000000..946cc01
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/133.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::uuid",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <uuid>'7babb5c3-d372-2d58-7879-f03559e523bb'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::uuid",
+      "value": "7babb5c3-d372-2d58-7879-f03559e523bb"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/14.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/14.json
new file mode 100644
index 0000000..de0cd68
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/14.json
@@ -0,0 +1,53 @@
+{
+  "name": "Query result of type array<cal::relative_duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<cal::relative_duration>'7689600 seconds', <cal::relative_duration>'1900800 seconds', <cal::relative_duration>'4579200 seconds', <cal::relative_duration>'3024000 seconds', <cal::relative_duration>'518400 seconds', <cal::relative_duration>'6307200 seconds', <cal::relative_duration>'6998400 seconds']",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "cal::relative_duration",
+          "value": "89.00:00:00"
+        },
+        {
+          "type": "cal::relative_duration",
+          "value": "22.00:00:00"
+        },
+        {
+          "type": "cal::relative_duration",
+          "value": "53.00:00:00"
+        },
+        {
+          "type": "cal::relative_duration",
+          "value": "35.00:00:00"
+        },
+        {
+          "type": "cal::relative_duration",
+          "value": "6.00:00:00"
+        },
+        {
+          "type": "cal::relative_duration",
+          "value": "73.00:00:00"
+        },
+        {
+          "type": "cal::relative_duration",
+          "value": "81.00:00:00"
+        }
+      ],
+      "element_type": "cal::relative_duration"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/15.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/15.json
new file mode 100644
index 0000000..842744a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/15.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::bigint",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bigint>-426042695n",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bigint",
+      "value": -426042695
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/16.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/16.json
new file mode 100644
index 0000000..d2c8e71
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/16.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::bool",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT false",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bool",
+      "value": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/17.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/17.json
new file mode 100644
index 0000000..9e1497d
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/17.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::bytes",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT b'CFLN2545VE1O2YH'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bytes",
+      "value": "Q0ZMTjI1NDVWRTFPMllI"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/18.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/18.json
new file mode 100644
index 0000000..774db2c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/18.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type cal::date_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::date_duration>'22999 days'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::date_duration",
+      "value": "22999.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/19.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/19.json
new file mode 100644
index 0000000..dd75787
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/19.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <datetime>'1210-07-03T13:25:52.416368-03:00'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::datetime",
+      "value": "1210-07-03T13:25:52.416368-03:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/2.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/2.json
new file mode 100644
index 0000000..2d71053
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/2.json
@@ -0,0 +1,69 @@
+{
+  "name": "Query result of type array<cal::date_duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<cal::date_duration>'3855 days', <cal::date_duration>'4463 days', <cal::date_duration>'11009 days', <cal::date_duration>'14303 days', <cal::date_duration>'-20031 days', <cal::date_duration>'-28664 days', <cal::date_duration>'12692 days', <cal::date_duration>'-73 days', <cal::date_duration>'8828 days', <cal::date_duration>'-22652 days', <cal::date_duration>'18472 days']",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "cal::date_duration",
+          "value": "3855.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "4463.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "11009.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "14303.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "-20031.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "-28664.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "12692.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "-73.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "8828.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "-22652.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "18472.00:00:00"
+        }
+      ],
+      "element_type": "cal::date_duration"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/20.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/20.json
new file mode 100644
index 0000000..a3874d9
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/20.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::decimal",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::decimal>0.64324768290074890n",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::decimal",
+      "value": 0.64324768290074890
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/21.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/21.json
new file mode 100644
index 0000000..0e75598
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/21.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <duration>'4579200 seconds'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::duration",
+      "value": "53.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/22.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/22.json
new file mode 100644
index 0000000..0bd0544
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/22.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::float32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <float32>-4.8779693n",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float32",
+      "value": -4.8779693
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/23.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/23.json
new file mode 100644
index 0000000..f6bb74c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/23.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::float64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <float64>-13.081097216848796n",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float64",
+      "value": -13.081097216848796
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/24.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/24.json
new file mode 100644
index 0000000..e2d7b6c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/24.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::int16",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <int16>232",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int16",
+      "value": 232
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/25.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/25.json
new file mode 100644
index 0000000..3e8ab41
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/25.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::int32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <int32>2094278752",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int32",
+      "value": 2094278752
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/26.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/26.json
new file mode 100644
index 0000000..25e46a9
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/26.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::int64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int64>8498763841820681955",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int64",
+      "value": 8498763841820681955
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/27.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/27.json
new file mode 100644
index 0000000..bf90290
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/27.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::json",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::json",
+      "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/28.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/28.json
new file mode 100644
index 0000000..15c1db9
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/28.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type cal::local_datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_datetime>'8783-08-11T08:41:50.393888'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_datetime",
+      "value": "8783-08-11T08:41:50.3938880"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/29.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/29.json
new file mode 100644
index 0000000..779da1c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/29.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type cal::local_date",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_date>'5776-06-21'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_date",
+      "value": "5776-06-21"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/3.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/3.json
new file mode 100644
index 0000000..d04d9ab
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/3.json
@@ -0,0 +1,65 @@
+{
+  "name": "Query result of type array<std::float64>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<float64>-23.972654636936568n, <float64>28.367043729111106n, <float64>-65.96622465223363n, <float64>73.91143105081815n, <float64>-27.178934427061552n, <float64>-57.77055594360947n, <float64>-3.5183610513426182n, <float64>23.98394125978646n, <float64>-13.798258539195293n, <float64>-23.750255691702595n]",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::float64",
+          "value": -23.972654636936568
+        },
+        {
+          "type": "std::float64",
+          "value": 28.367043729111106
+        },
+        {
+          "type": "std::float64",
+          "value": -65.96622465223363
+        },
+        {
+          "type": "std::float64",
+          "value": 73.91143105081815
+        },
+        {
+          "type": "std::float64",
+          "value": -27.178934427061552
+        },
+        {
+          "type": "std::float64",
+          "value": -57.77055594360947
+        },
+        {
+          "type": "std::float64",
+          "value": -3.5183610513426182
+        },
+        {
+          "type": "std::float64",
+          "value": 23.98394125978646
+        },
+        {
+          "type": "std::float64",
+          "value": -13.798258539195293
+        },
+        {
+          "type": "std::float64",
+          "value": -23.750255691702595
+        }
+      ],
+      "element_type": "std::float64"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/30.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/30.json
new file mode 100644
index 0000000..a5a65b9
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/30.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type cal::local_time",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_time>'10:39:39.3542810'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_time",
+      "value": "10:39:39.3542810"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/31.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/31.json
new file mode 100644
index 0000000..a6e476c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/31.json
@@ -0,0 +1,40 @@
+{
+  "name": "Query result of type namedtuple<std::int32, cal::date_duration, std::datetime, std::str>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (WPNJMAQLQRZDVQT := <int32>17761734, GLGCRGUQVXJNVNE := <cal::date_duration>'7385 days', YPQFBEQALABEINP := <datetime>'0848-12-20T06:34:40.031776-04:00', DFWEITSQDHXVEUX := 'UVKEBJBLQUTPQOV')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "WPNJMAQLQRZDVQT": {
+          "type": "std::int32",
+          "value": 17761734
+        },
+        "GLGCRGUQVXJNVNE": {
+          "type": "cal::date_duration",
+          "value": "7385.00:00:00"
+        },
+        "YPQFBEQALABEINP": {
+          "type": "std::datetime",
+          "value": "0848-12-20T06:34:40.031776-04:00"
+        },
+        "DFWEITSQDHXVEUX": {
+          "type": "std::str",
+          "value": "UVKEBJBLQUTPQOV"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/32.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/32.json
new file mode 100644
index 0000000..a5f9232
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/32.json
@@ -0,0 +1,40 @@
+{
+  "name": "Query result of type namedtuple<cal::date_duration, std::datetime, std::str, std::int32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (SXBAKRPWYOYXTFH := <cal::date_duration>'-6963 days', OSEXOUDKOOZCAPL := <datetime>'9448-07-17T13:23:10.892192-03:00', GTXECGNGNLESKMO := 'AZDUVJGWZDAXVNI', UDBLGLLMQRAIZRD := <int32>224442360)",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "SXBAKRPWYOYXTFH": {
+          "type": "cal::date_duration",
+          "value": "-6963.00:00:00"
+        },
+        "OSEXOUDKOOZCAPL": {
+          "type": "std::datetime",
+          "value": "9448-07-17T13:23:10.892192-03:00"
+        },
+        "GTXECGNGNLESKMO": {
+          "type": "std::str",
+          "value": "AZDUVJGWZDAXVNI"
+        },
+        "UDBLGLLMQRAIZRD": {
+          "type": "std::int32",
+          "value": 224442360
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/33.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/33.json
new file mode 100644
index 0000000..d92d2f1
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/33.json
@@ -0,0 +1,40 @@
+{
+  "name": "Query result of type namedtuple<std::datetime, std::str, std::int32, cal::date_duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (RZQHEGXMAEZFQKZ := <datetime>'1137-10-16T13:42:32.948868-03:00', XHKCEONRDEIYXIZ := 'MEOSDQWDZGHMGAH', FGTWRIMKCQACOOC := <int32>1862434029, IEFLKOHKHDYHBLD := <cal::date_duration>'28826 days')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "RZQHEGXMAEZFQKZ": {
+          "type": "std::datetime",
+          "value": "1137-10-16T13:42:32.948868-03:00"
+        },
+        "XHKCEONRDEIYXIZ": {
+          "type": "std::str",
+          "value": "MEOSDQWDZGHMGAH"
+        },
+        "FGTWRIMKCQACOOC": {
+          "type": "std::int32",
+          "value": 1862434029
+        },
+        "IEFLKOHKHDYHBLD": {
+          "type": "cal::date_duration",
+          "value": "28826.00:00:00"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/34.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/34.json
new file mode 100644
index 0000000..84f800f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/34.json
@@ -0,0 +1,40 @@
+{
+  "name": "Query result of type namedtuple<std::datetime, std::str, std::int32, cal::date_duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (QODFESDPNPTOKDK := <datetime>'4750-01-06T12:43:38.589376-04:00', WBOUSMLKEODBEXF := 'WMIWCZNIVASQSSU', ONHVTXYCRVZEANI := <int32>1492508410, IORCPVWOGZRTVSM := <cal::date_duration>'-24620 days')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "QODFESDPNPTOKDK": {
+          "type": "std::datetime",
+          "value": "4750-01-06T12:43:38.589376-04:00"
+        },
+        "WBOUSMLKEODBEXF": {
+          "type": "std::str",
+          "value": "WMIWCZNIVASQSSU"
+        },
+        "ONHVTXYCRVZEANI": {
+          "type": "std::int32",
+          "value": 1492508410
+        },
+        "IORCPVWOGZRTVSM": {
+          "type": "cal::date_duration",
+          "value": "-24620.00:00:00"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/35.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/35.json
new file mode 100644
index 0000000..ce55028
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/35.json
@@ -0,0 +1,40 @@
+{
+  "name": "Query result of type namedtuple<std::datetime, std::str, std::int32, cal::date_duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (RPKNZNGFHAIIISA := <datetime>'1182-03-30T12:41:26.799688-04:00', ECVZRLGMYHIWDMK := 'ARCCUPEVJOVFYQZ', SHHQKNAEEBAGYJD := <int32>1105533558, NIAYAPPYZPDPAOH := <cal::date_duration>'9917 days')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "RPKNZNGFHAIIISA": {
+          "type": "std::datetime",
+          "value": "1182-03-30T12:41:26.799688-04:00"
+        },
+        "ECVZRLGMYHIWDMK": {
+          "type": "std::str",
+          "value": "ARCCUPEVJOVFYQZ"
+        },
+        "SHHQKNAEEBAGYJD": {
+          "type": "std::int32",
+          "value": 1105533558
+        },
+        "NIAYAPPYZPDPAOH": {
+          "type": "cal::date_duration",
+          "value": "9917.00:00:00"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/36.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/36.json
new file mode 100644
index 0000000..9a6db32
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/36.json
@@ -0,0 +1,40 @@
+{
+  "name": "Query result of type namedtuple<std::str, std::int32, cal::date_duration, std::datetime>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (VFUKMRXYTOYXAKI := 'KIYVRRSSLYWPDMT', JFIIDDVJABWAABO := <int32>1576340248, SEZJSMDMBZOUHVG := <cal::date_duration>'26230 days', VBADGNOVQVRRJJD := <datetime>'3449-08-25T08:07:30.948016-03:00')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "VFUKMRXYTOYXAKI": {
+          "type": "std::str",
+          "value": "KIYVRRSSLYWPDMT"
+        },
+        "JFIIDDVJABWAABO": {
+          "type": "std::int32",
+          "value": 1576340248
+        },
+        "SEZJSMDMBZOUHVG": {
+          "type": "cal::date_duration",
+          "value": "26230.00:00:00"
+        },
+        "VBADGNOVQVRRJJD": {
+          "type": "std::datetime",
+          "value": "3449-08-25T08:07:30.948016-03:00"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/37.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/37.json
new file mode 100644
index 0000000..3674c83
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/37.json
@@ -0,0 +1,40 @@
+{
+  "name": "Query result of type namedtuple<std::int32, cal::date_duration, std::datetime, std::str>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (IUOQSFWCEHPSGPG := <int32>45322332, TRGPXLVXVIUJPEQ := <cal::date_duration>'31187 days', AKXCWEBBGYCKFLR := <datetime>'8786-03-03T16:09:10.634144-04:00', MCVKITTXWBSPCYU := 'RFPPQUCNVFWVLCI')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "IUOQSFWCEHPSGPG": {
+          "type": "std::int32",
+          "value": 45322332
+        },
+        "TRGPXLVXVIUJPEQ": {
+          "type": "cal::date_duration",
+          "value": "31187.00:00:00"
+        },
+        "AKXCWEBBGYCKFLR": {
+          "type": "std::datetime",
+          "value": "8786-03-03T16:09:10.634144-04:00"
+        },
+        "MCVKITTXWBSPCYU": {
+          "type": "std::str",
+          "value": "RFPPQUCNVFWVLCI"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/38.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/38.json
new file mode 100644
index 0000000..3eb39fe
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/38.json
@@ -0,0 +1,44 @@
+{
+  "name": "Query result of type namedtuple<std::int32, cal::relative_duration, std::json, std::bigint, std::float32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (SOEWPORREFZCJMD := <int32>18813002, OOFBHZRAIOCXXLU := <cal::relative_duration>'6220800 seconds', WNTXGCNYKLUADJB := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), NWOCQKPNWGAPTHT := <std::bigint>-2328820686276n, LSDWNWZEFABJOFP := <float32>-15.501619n)",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "SOEWPORREFZCJMD": {
+          "type": "std::int32",
+          "value": 18813002
+        },
+        "OOFBHZRAIOCXXLU": {
+          "type": "cal::relative_duration",
+          "value": "72.00:00:00"
+        },
+        "WNTXGCNYKLUADJB": {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        },
+        "NWOCQKPNWGAPTHT": {
+          "type": "std::bigint",
+          "value": -2328820686276
+        },
+        "LSDWNWZEFABJOFP": {
+          "type": "std::float32",
+          "value": -15.501619
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/39.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/39.json
new file mode 100644
index 0000000..eabdac6
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/39.json
@@ -0,0 +1,44 @@
+{
+  "name": "Query result of type namedtuple<cal::relative_duration, std::json, std::bigint, std::float32, std::int32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (BZCYEDRPQUTLPEO := <cal::relative_duration>'1123200 seconds', NOBQWCUOSXFATAE := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), ZIIITYTWHJKLOLF := <std::bigint>-1224023203n, QFXIKMGMOWTPTQW := <float32>17.09441n, VFIMRIZGSFYOFGV := <int32>723842087)",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "BZCYEDRPQUTLPEO": {
+          "type": "cal::relative_duration",
+          "value": "13.00:00:00"
+        },
+        "NOBQWCUOSXFATAE": {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        },
+        "ZIIITYTWHJKLOLF": {
+          "type": "std::bigint",
+          "value": -1224023203
+        },
+        "QFXIKMGMOWTPTQW": {
+          "type": "std::float32",
+          "value": 17.09441
+        },
+        "VFIMRIZGSFYOFGV": {
+          "type": "std::int32",
+          "value": 723842087
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/4.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/4.json
new file mode 100644
index 0000000..1a82067
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/4.json
@@ -0,0 +1,49 @@
+{
+  "name": "Query result of type array<std::int16>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<int16>12014, <int16>25850, <int16>9970, <int16>3635, <int16>28035, <int16>8265]",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::int16",
+          "value": 12014
+        },
+        {
+          "type": "std::int16",
+          "value": 25850
+        },
+        {
+          "type": "std::int16",
+          "value": 9970
+        },
+        {
+          "type": "std::int16",
+          "value": 3635
+        },
+        {
+          "type": "std::int16",
+          "value": 28035
+        },
+        {
+          "type": "std::int16",
+          "value": 8265
+        }
+      ],
+      "element_type": "std::int16"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/40.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/40.json
new file mode 100644
index 0000000..854739c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/40.json
@@ -0,0 +1,44 @@
+{
+  "name": "Query result of type namedtuple<std::json, std::bigint, std::float32, std::int32, cal::relative_duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (LAJMNJSMRWUVJUG := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), GCQHSFZKGNHQIOI := <std::bigint>-1220156136294580477973718908688492n, KRBYDEAJGBYFZCB := <float32>-1.7336596n, OPAMFEUVSSENGVF := <int32>1879848869, HPEUGJNTJXJTNWX := <cal::relative_duration>'7948800 seconds')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "LAJMNJSMRWUVJUG": {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        },
+        "GCQHSFZKGNHQIOI": {
+          "type": "std::bigint",
+          "value": -1220156136294580477973718908688492
+        },
+        "KRBYDEAJGBYFZCB": {
+          "type": "std::float32",
+          "value": -1.7336596
+        },
+        "OPAMFEUVSSENGVF": {
+          "type": "std::int32",
+          "value": 1879848869
+        },
+        "HPEUGJNTJXJTNWX": {
+          "type": "cal::relative_duration",
+          "value": "92.00:00:00"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/41.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/41.json
new file mode 100644
index 0000000..676b136
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/41.json
@@ -0,0 +1,44 @@
+{
+  "name": "Query result of type namedtuple<std::json, std::bigint, std::float32, std::int32, cal::relative_duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (WSJEVTJJIRCOSJT := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), CWNJCHFNSWHLCEV := <std::bigint>-125808833171573n, VVKYSLFQNPNLZKO := <float32>13.678896n, MZMYHEVVZVKHSHL := <int32>1426556052, RJNCNFTWPSWWARK := <cal::relative_duration>'8467200 seconds')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "WSJEVTJJIRCOSJT": {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        },
+        "CWNJCHFNSWHLCEV": {
+          "type": "std::bigint",
+          "value": -125808833171573
+        },
+        "VVKYSLFQNPNLZKO": {
+          "type": "std::float32",
+          "value": 13.678896
+        },
+        "MZMYHEVVZVKHSHL": {
+          "type": "std::int32",
+          "value": 1426556052
+        },
+        "RJNCNFTWPSWWARK": {
+          "type": "cal::relative_duration",
+          "value": "98.00:00:00"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/42.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/42.json
new file mode 100644
index 0000000..c59222d
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/42.json
@@ -0,0 +1,44 @@
+{
+  "name": "Query result of type namedtuple<std::bigint, std::float32, std::int32, cal::relative_duration, std::json>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (IMJXDTXQGVDIUDN := <std::bigint>31091207948424342374743134649n, ZDZHBZZHQNPQLHK := <float32>32.56249n, IDYCDZWJSQVLHYR := <int32>572238337, DASEOLLBQJIRJDO := <cal::relative_duration>'7689600 seconds', QVAAVHEPHRUBISU := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'))",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "IMJXDTXQGVDIUDN": {
+          "type": "std::bigint",
+          "value": 31091207948424342374743134649
+        },
+        "ZDZHBZZHQNPQLHK": {
+          "type": "std::float32",
+          "value": 32.56249
+        },
+        "IDYCDZWJSQVLHYR": {
+          "type": "std::int32",
+          "value": 572238337
+        },
+        "DASEOLLBQJIRJDO": {
+          "type": "cal::relative_duration",
+          "value": "89.00:00:00"
+        },
+        "QVAAVHEPHRUBISU": {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/43.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/43.json
new file mode 100644
index 0000000..afebd3b
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/43.json
@@ -0,0 +1,44 @@
+{
+  "name": "Query result of type namedtuple<std::float32, std::int32, cal::relative_duration, std::json, std::bigint>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (SMNCLURNANQOSJN := <float32>15.313611n, VGRHSNOHTQAIRNQ := <int32>1370225842, AVLVDMZIRPWXENN := <cal::relative_duration>'7603200 seconds', ZTBEUOWNYXAEZBC := std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), WGTZLRURZBXRJOC := <std::bigint>1850481249361035672186n)",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "namedtuple",
+      "value": {
+        "SMNCLURNANQOSJN": {
+          "type": "std::float32",
+          "value": 15.313611
+        },
+        "VGRHSNOHTQAIRNQ": {
+          "type": "std::int32",
+          "value": 1370225842
+        },
+        "AVLVDMZIRPWXENN": {
+          "type": "cal::relative_duration",
+          "value": "88.00:00:00"
+        },
+        "ZTBEUOWNYXAEZBC": {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        },
+        "WGTZLRURZBXRJOC": {
+          "type": "std::bigint",
+          "value": 1850481249361035672186
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/44.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/44.json
new file mode 100644
index 0000000..94dc004
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/44.json
@@ -0,0 +1,48 @@
+{
+  "name": "Query result of type object<std::int32, std::str, cal::local_datetime, std::bool, std::decimal, std::bigint>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { FPZDROUEIHTXYIZ := <int32>798958224, SQFDJUNTSOFDKAM := 'DLESVKJWFGVTNIF', FGNPJFVUMKYAOBY := <cal::local_datetime>'2508-08-05T22:17:15.947312', NVWVRJIHIYDZTGK := false, XDNWAXQKGLLJIDI := <std::decimal>27.382888366646561n, MIBOWEIBHSVSENR := <std::bigint>-130557690059558n }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "object",
+      "value": {
+        "FPZDROUEIHTXYIZ": {
+          "type": "std::int32",
+          "value": 798958224
+        },
+        "SQFDJUNTSOFDKAM": {
+          "type": "std::str",
+          "value": "DLESVKJWFGVTNIF"
+        },
+        "FGNPJFVUMKYAOBY": {
+          "type": "cal::local_datetime",
+          "value": "2508-08-05T22:17:15.9473120"
+        },
+        "NVWVRJIHIYDZTGK": {
+          "type": "std::bool",
+          "value": false
+        },
+        "XDNWAXQKGLLJIDI": {
+          "type": "std::decimal",
+          "value": 27.382888366646561
+        },
+        "MIBOWEIBHSVSENR": {
+          "type": "std::bigint",
+          "value": -130557690059558
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/45.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/45.json
new file mode 100644
index 0000000..195fdca
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/45.json
@@ -0,0 +1,48 @@
+{
+  "name": "Query result of type object<std::str, cal::local_datetime, std::bool, std::decimal, std::bigint, std::int32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { KLYWYAUUJHGXAHJ := 'JOYPXPNHXRCANWB', PCQCYHKBNXLKXQR := <cal::local_datetime>'9086-11-24T17:30:18.55744', OJWOIJVXQYGXUHN := true, IYRGHBDXCZDCJHA := <std::decimal>4.248353276517416n, MFYGTVFHIEETPXF := <std::bigint>433765880973n, SRFJRUHRFSOJBZV := <int32>126975970 }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "object",
+      "value": {
+        "KLYWYAUUJHGXAHJ": {
+          "type": "std::str",
+          "value": "JOYPXPNHXRCANWB"
+        },
+        "PCQCYHKBNXLKXQR": {
+          "type": "cal::local_datetime",
+          "value": "9086-11-24T17:30:18.5574400"
+        },
+        "OJWOIJVXQYGXUHN": {
+          "type": "std::bool",
+          "value": true
+        },
+        "IYRGHBDXCZDCJHA": {
+          "type": "std::decimal",
+          "value": 4.248353276517416
+        },
+        "MFYGTVFHIEETPXF": {
+          "type": "std::bigint",
+          "value": 433765880973
+        },
+        "SRFJRUHRFSOJBZV": {
+          "type": "std::int32",
+          "value": 126975970
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/46.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/46.json
new file mode 100644
index 0000000..5de693c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/46.json
@@ -0,0 +1,48 @@
+{
+  "name": "Query result of type object<cal::local_datetime, std::bool, std::decimal, std::bigint, std::int32, std::str>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { VBZSZTJJGXFZHYS := <cal::local_datetime>'6658-08-29T06:07:46.67456', MHBJDKARYLEGWFI := false, KMHPTXVZLXBRXTW := <std::decimal>62.789543114038920n, OZVSRZBBHEDJRXT := <std::bigint>27927622919633414836829882614n, RIOYSTGSRVHORQR := <int32>1842727205, FEXDFQHITFULAEA := 'APVPLZDNBWKCABT' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "object",
+      "value": {
+        "VBZSZTJJGXFZHYS": {
+          "type": "cal::local_datetime",
+          "value": "6658-08-29T06:07:46.6745600"
+        },
+        "MHBJDKARYLEGWFI": {
+          "type": "std::bool",
+          "value": false
+        },
+        "KMHPTXVZLXBRXTW": {
+          "type": "std::decimal",
+          "value": 62.789543114038920
+        },
+        "OZVSRZBBHEDJRXT": {
+          "type": "std::bigint",
+          "value": 27927622919633414836829882614
+        },
+        "RIOYSTGSRVHORQR": {
+          "type": "std::int32",
+          "value": 1842727205
+        },
+        "FEXDFQHITFULAEA": {
+          "type": "std::str",
+          "value": "APVPLZDNBWKCABT"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/47.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/47.json
new file mode 100644
index 0000000..ac150cb
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/47.json
@@ -0,0 +1,48 @@
+{
+  "name": "Query result of type object<std::bool, std::decimal, std::bigint, std::int32, std::str, cal::local_datetime>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { NPHUCWLSGQYOMGR := false, NRAVHQGBKCJFFIR := <std::decimal>9.395749908590580n, KWGYDEDIVAOBUFT := <std::bigint>-6137407327452039693781853372133n, HCHIGUAPNWRYVFM := <int32>776788303, ELJVHTLRLVOGIBP := 'NTMTLYYVYWXBHEV', INXBRMAJVRUZMIF := <cal::local_datetime>'7699-10-23T22:08:26.662112' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "object",
+      "value": {
+        "NPHUCWLSGQYOMGR": {
+          "type": "std::bool",
+          "value": false
+        },
+        "NRAVHQGBKCJFFIR": {
+          "type": "std::decimal",
+          "value": 9.395749908590580
+        },
+        "KWGYDEDIVAOBUFT": {
+          "type": "std::bigint",
+          "value": -6137407327452039693781853372133
+        },
+        "HCHIGUAPNWRYVFM": {
+          "type": "std::int32",
+          "value": 776788303
+        },
+        "ELJVHTLRLVOGIBP": {
+          "type": "std::str",
+          "value": "NTMTLYYVYWXBHEV"
+        },
+        "INXBRMAJVRUZMIF": {
+          "type": "cal::local_datetime",
+          "value": "7699-10-23T22:08:26.6621120"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/48.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/48.json
new file mode 100644
index 0000000..bc8ac9a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/48.json
@@ -0,0 +1,48 @@
+{
+  "name": "Query result of type object<std::bool, std::decimal, std::bigint, std::int32, std::str, cal::local_datetime>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { QHMZPVFMNWKWJJH := false, XVEOQASDYUEZJPR := <std::decimal>11.498423452255544n, WJGTSRODPPNLHNA := <std::bigint>-380312863485n, TWRABNEHTTKSKQB := <int32>317495129, NZNLDQMNQZFDHNL := 'PPKCRPBZIWTBPCK', HGCOMVQFENLOYEL := <cal::local_datetime>'2039-07-31T20:18:47.202461' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "object",
+      "value": {
+        "QHMZPVFMNWKWJJH": {
+          "type": "std::bool",
+          "value": false
+        },
+        "XVEOQASDYUEZJPR": {
+          "type": "std::decimal",
+          "value": 11.498423452255544
+        },
+        "WJGTSRODPPNLHNA": {
+          "type": "std::bigint",
+          "value": -380312863485
+        },
+        "TWRABNEHTTKSKQB": {
+          "type": "std::int32",
+          "value": 317495129
+        },
+        "NZNLDQMNQZFDHNL": {
+          "type": "std::str",
+          "value": "PPKCRPBZIWTBPCK"
+        },
+        "HGCOMVQFENLOYEL": {
+          "type": "cal::local_datetime",
+          "value": "2039-07-31T20:18:47.2024610"
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/49.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/49.json
new file mode 100644
index 0000000..0a69586
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/49.json
@@ -0,0 +1,48 @@
+{
+  "name": "Query result of type object<std::decimal, std::bigint, std::int32, std::str, cal::local_datetime, std::bool>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { AVARBLXYNCGWKYN := <std::decimal>5.706994526883120n, BLWETZEXEEMADKO := <std::bigint>-98608830011n, EQYTJJUOXZVIKTB := <int32>1809146911, BMDHTLNYWHHJGFR := 'GHGFAQVDPHNEVAV', SFIYCNLFLUNBNFQ := <cal::local_datetime>'7921-04-15T08:08:34.910976', TEMVPBLRARLYIDV := true }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "object",
+      "value": {
+        "AVARBLXYNCGWKYN": {
+          "type": "std::decimal",
+          "value": 5.706994526883120
+        },
+        "BLWETZEXEEMADKO": {
+          "type": "std::bigint",
+          "value": -98608830011
+        },
+        "EQYTJJUOXZVIKTB": {
+          "type": "std::int32",
+          "value": 1809146911
+        },
+        "BMDHTLNYWHHJGFR": {
+          "type": "std::str",
+          "value": "GHGFAQVDPHNEVAV"
+        },
+        "SFIYCNLFLUNBNFQ": {
+          "type": "cal::local_datetime",
+          "value": "7921-04-15T08:08:34.9109760"
+        },
+        "TEMVPBLRARLYIDV": {
+          "type": "std::bool",
+          "value": true
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/5.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/5.json
new file mode 100644
index 0000000..0d96bc7
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/5.json
@@ -0,0 +1,97 @@
+{
+  "name": "Query result of type array<std::duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<duration>'38707200 seconds', <duration>'30672000 seconds', <duration>'35510400 seconds', <duration>'1209600 seconds', <duration>'18316800 seconds', <duration>'29116800 seconds', <duration>'14688000 seconds', <duration>'40435200 seconds', <duration>'2678400 seconds', <duration>'37411200 seconds', <duration>'38016000 seconds', <duration>'42249600 seconds', <duration>'21427200 seconds', <duration>'22291200 seconds', <duration>'37065600 seconds', <duration>'16588800 seconds', <duration>'28339200 seconds', <duration>'10886400 seconds']",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::duration",
+          "value": "448.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "355.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "411.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "14.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "212.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "337.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "170.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "468.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "31.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "433.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "440.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "489.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "248.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "258.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "429.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "192.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "328.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "126.00:00:00"
+        }
+      ],
+      "element_type": "std::duration"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/50.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/50.json
new file mode 100644
index 0000000..08f01a1
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/50.json
@@ -0,0 +1,48 @@
+{
+  "name": "Query result of type object<std::bigint, std::int32, std::str, cal::local_datetime, std::bool, std::decimal>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { RAWSMSVAUGCUQKQ := <std::bigint>143094199534470925077697018n, GCQROHOQYMGLQUV := <int32>1727116661, XKHUGJBZEZOVYLL := 'VUSPLGIWAUNVKRK', JPKROEATORKHZUZ := <cal::local_datetime>'0301-05-25T16:17:22.156216', OUADFWRBKULVGPM := false, LJATIRTYATWBWFU := <std::decimal>49.282034807504156n }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "object",
+      "value": {
+        "RAWSMSVAUGCUQKQ": {
+          "type": "std::bigint",
+          "value": 143094199534470925077697018
+        },
+        "GCQROHOQYMGLQUV": {
+          "type": "std::int32",
+          "value": 1727116661
+        },
+        "XKHUGJBZEZOVYLL": {
+          "type": "std::str",
+          "value": "VUSPLGIWAUNVKRK"
+        },
+        "JPKROEATORKHZUZ": {
+          "type": "cal::local_datetime",
+          "value": "0301-05-25T16:17:22.1562160"
+        },
+        "OUADFWRBKULVGPM": {
+          "type": "std::bool",
+          "value": false
+        },
+        "LJATIRTYATWBWFU": {
+          "type": "std::decimal",
+          "value": 49.282034807504156
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/51.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/51.json
new file mode 100644
index 0000000..9ca3a54
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/51.json
@@ -0,0 +1,29 @@
+{
+  "name": "Query result of type range<std::int32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT range(<int32>1836501494, <int32>1905373727)",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": 1836501494,
+        "upper": 1905373727,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::int32"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/52.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/52.json
new file mode 100644
index 0000000..262afe2
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/52.json
@@ -0,0 +1,29 @@
+{
+  "name": "Query result of type range<std::int64>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT range(<std::int64>1612976216290922701, <std::int64>5710095882428791084)",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": 1612976216290922701,
+        "upper": 5710095882428791084,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::int64"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/53.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/53.json
new file mode 100644
index 0000000..a6f926e
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/53.json
@@ -0,0 +1,29 @@
+{
+  "name": "Query result of type range<std::float32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT range(<float32>5.8365154n, <float32>66.17244n)",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": 5.8365154,
+        "upper": 66.17244,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::float32"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/54.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/54.json
new file mode 100644
index 0000000..18867c8
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/54.json
@@ -0,0 +1,29 @@
+{
+  "name": "Query result of type range<std::float64>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT range(<float64>-19.80835727407055n, <float64>1.5223045942943099n)",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": -19.80835727407055,
+        "upper": 1.5223045942943099,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::float64"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/55.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/55.json
new file mode 100644
index 0000000..95a14d9
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/55.json
@@ -0,0 +1,29 @@
+{
+  "name": "Query result of type range<std::decimal>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT range(<std::decimal>4.290668910504630n, <std::decimal>30.052965146979744n)",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": 4.290668910504630,
+        "upper": 30.052965146979744,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::decimal"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/56.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/56.json
new file mode 100644
index 0000000..af58a5e
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/56.json
@@ -0,0 +1,29 @@
+{
+  "name": "Query result of type range<std::datetime>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT range(<datetime>'6487-05-05T10:04:11.024096-03:00', <datetime>'7292-07-02T19:44:35.752768-03:00')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": "6487-05-05T10:04:11.024096-03:00",
+        "upper": "7292-07-02T19:44:35.752768-03:00",
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::datetime"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/57.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/57.json
new file mode 100644
index 0000000..7f6e08d
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/57.json
@@ -0,0 +1,29 @@
+{
+  "name": "Query result of type range<cal::local_datetime>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT range(<cal::local_datetime>'5910-12-20T05:25:40.413264', <cal::local_datetime>'6549-03-14T19:50:47.231328')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": "5910-12-20T05:25:40.4132640",
+        "upper": "6549-03-14T19:50:47.2313280",
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "cal::local_datetime"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/58.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/58.json
new file mode 100644
index 0000000..ae549d4
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/58.json
@@ -0,0 +1,29 @@
+{
+  "name": "Query result of type range<cal::local_date>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT range(<cal::local_date>'2907-07-22', <cal::local_date>'7136-11-14')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": "2907-07-22",
+        "upper": "7136-11-14",
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "cal::local_date"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/59.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/59.json
new file mode 100644
index 0000000..dfb9aaf
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/59.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type cal::relative_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::relative_duration>'5702400 seconds'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::relative_duration",
+      "value": "66.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/6.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/6.json
new file mode 100644
index 0000000..bf47e01
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/6.json
@@ -0,0 +1,69 @@
+{
+  "name": "Query result of type array<std::duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<duration>'172800 seconds', <duration>'26697600 seconds', <duration>'777600 seconds', <duration>'21168000 seconds', <duration>'37152000 seconds', <duration>'7948800 seconds', <duration>'9849600 seconds', <duration>'24710400 seconds', <duration>'19440000 seconds', <duration>'31968000 seconds', <duration>'36288000 seconds']",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::duration",
+          "value": "2.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "309.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "9.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "245.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "430.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "92.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "114.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "286.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "225.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "370.00:00:00"
+        },
+        {
+          "type": "std::duration",
+          "value": "420.00:00:00"
+        }
+      ],
+      "element_type": "std::duration"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/60.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/60.json
new file mode 100644
index 0000000..3439414
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/60.json
@@ -0,0 +1,95 @@
+{
+  "name": "Query result of type set<cal::local_time>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <cal::local_time>'19:45:19.1611560', <cal::local_time>'20:20:04.9589060', <cal::local_time>'14:20:17.7725620', <cal::local_time>'18:35:08.1408830', <cal::local_time>'13:07:02.4706250', <cal::local_time>'03:55:57.1974380', <cal::local_time>'01:48:58.7961880', <cal::local_time>'17:03:51.4865310', <cal::local_time>'18:19:34.4418630', <cal::local_time>'01:02:52.8844660', <cal::local_time>'10:40:23.2515160', <cal::local_time>'01:18:15.4461880', <cal::local_time>'05:10:05.0863120', <cal::local_time>'23:32:30.3758750', <cal::local_time>'15:33:26.7695940', <cal::local_time>'03:59:40.6023120', <cal::local_time>'16:03:04.8635620', <cal::local_time>'19:27:12.9221560' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "cal::local_time",
+        "value": "19:45:19.1611560"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "20:20:04.9589060"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "14:20:17.7725620"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "18:35:08.1408830"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "13:07:02.4706250"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "03:55:57.1974380"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "01:48:58.7961880"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "17:03:51.4865310"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "18:19:34.4418630"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "01:02:52.8844660"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "10:40:23.2515160"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "01:18:15.4461880"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "05:10:05.0863120"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "23:32:30.3758750"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "15:33:26.7695940"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "03:59:40.6023120"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "16:03:04.8635620"
+      },
+      {
+        "type": "cal::local_time",
+        "value": "19:27:12.9221560"
+      }
+    ],
+    "element_type": "cal::local_time"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/61.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/61.json
new file mode 100644
index 0000000..98a6441
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/61.json
@@ -0,0 +1,35 @@
+{
+  "name": "Query result of type set<cal::date_duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <cal::date_duration>'-12030 days', <cal::date_duration>'18412 days', <cal::date_duration>'-1483 days' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "cal::date_duration",
+        "value": "-12030.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "18412.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-1483.00:00:00"
+      }
+    ],
+    "element_type": "cal::date_duration"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/62.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/62.json
new file mode 100644
index 0000000..4cf2c5b
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/62.json
@@ -0,0 +1,79 @@
+{
+  "name": "Query result of type set<cal::date_duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <cal::date_duration>'-30707 days', <cal::date_duration>'-28841 days', <cal::date_duration>'4167 days', <cal::date_duration>'-15185 days', <cal::date_duration>'-23262 days', <cal::date_duration>'-22204 days', <cal::date_duration>'26383 days', <cal::date_duration>'3034 days', <cal::date_duration>'2175 days', <cal::date_duration>'-9212 days', <cal::date_duration>'11618 days', <cal::date_duration>'18352 days', <cal::date_duration>'7858 days', <cal::date_duration>'-21634 days' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "cal::date_duration",
+        "value": "-30707.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-28841.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "4167.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-15185.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-23262.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-22204.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "26383.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "3034.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "2175.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-9212.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "11618.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "18352.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "7858.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-21634.00:00:00"
+      }
+    ],
+    "element_type": "cal::date_duration"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/63.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/63.json
new file mode 100644
index 0000000..e36b5ee
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/63.json
@@ -0,0 +1,75 @@
+{
+  "name": "Query result of type set<cal::date_duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <cal::date_duration>'-24332 days', <cal::date_duration>'-27773 days', <cal::date_duration>'26304 days', <cal::date_duration>'19678 days', <cal::date_duration>'32374 days', <cal::date_duration>'-17897 days', <cal::date_duration>'-2230 days', <cal::date_duration>'8518 days', <cal::date_duration>'15510 days', <cal::date_duration>'23111 days', <cal::date_duration>'-15352 days', <cal::date_duration>'-16860 days', <cal::date_duration>'29045 days' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "cal::date_duration",
+        "value": "-24332.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-27773.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "26304.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "19678.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "32374.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-17897.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-2230.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "8518.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "15510.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "23111.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-15352.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "-16860.00:00:00"
+      },
+      {
+        "type": "cal::date_duration",
+        "value": "29045.00:00:00"
+      }
+    ],
+    "element_type": "cal::date_duration"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/64.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/64.json
new file mode 100644
index 0000000..4cdf72b
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/64.json
@@ -0,0 +1,59 @@
+{
+  "name": "Query result of type set<std::int16>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <int16>15595, <int16>14424, <int16>28795, <int16>23268, <int16>26123, <int16>5587, <int16>7983, <int16>31696, <int16>26540 }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "std::int16",
+        "value": 15595
+      },
+      {
+        "type": "std::int16",
+        "value": 14424
+      },
+      {
+        "type": "std::int16",
+        "value": 28795
+      },
+      {
+        "type": "std::int16",
+        "value": 23268
+      },
+      {
+        "type": "std::int16",
+        "value": 26123
+      },
+      {
+        "type": "std::int16",
+        "value": 5587
+      },
+      {
+        "type": "std::int16",
+        "value": 7983
+      },
+      {
+        "type": "std::int16",
+        "value": 31696
+      },
+      {
+        "type": "std::int16",
+        "value": 26540
+      }
+    ],
+    "element_type": "std::int16"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/65.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/65.json
new file mode 100644
index 0000000..0de3e4b
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/65.json
@@ -0,0 +1,91 @@
+{
+  "name": "Query result of type set<std::int32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <int32>460742380, <int32>5208767, <int32>792494801, <int32>1056681905, <int32>2110799879, <int32>168323939, <int32>469398491, <int32>1578323156, <int32>2029794375, <int32>615269910, <int32>1365880063, <int32>644548368, <int32>632754932, <int32>1646008976, <int32>1304812893, <int32>2050682060, <int32>39512929 }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "std::int32",
+        "value": 460742380
+      },
+      {
+        "type": "std::int32",
+        "value": 5208767
+      },
+      {
+        "type": "std::int32",
+        "value": 792494801
+      },
+      {
+        "type": "std::int32",
+        "value": 1056681905
+      },
+      {
+        "type": "std::int32",
+        "value": 2110799879
+      },
+      {
+        "type": "std::int32",
+        "value": 168323939
+      },
+      {
+        "type": "std::int32",
+        "value": 469398491
+      },
+      {
+        "type": "std::int32",
+        "value": 1578323156
+      },
+      {
+        "type": "std::int32",
+        "value": 2029794375
+      },
+      {
+        "type": "std::int32",
+        "value": 615269910
+      },
+      {
+        "type": "std::int32",
+        "value": 1365880063
+      },
+      {
+        "type": "std::int32",
+        "value": 644548368
+      },
+      {
+        "type": "std::int32",
+        "value": 632754932
+      },
+      {
+        "type": "std::int32",
+        "value": 1646008976
+      },
+      {
+        "type": "std::int32",
+        "value": 1304812893
+      },
+      {
+        "type": "std::int32",
+        "value": 2050682060
+      },
+      {
+        "type": "std::int32",
+        "value": 39512929
+      }
+    ],
+    "element_type": "std::int32"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/66.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/66.json
new file mode 100644
index 0000000..dd121a0
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/66.json
@@ -0,0 +1,43 @@
+{
+  "name": "Query result of type set<std::json>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}') }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      },
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      },
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      },
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      },
+      {
+        "type": "std::json",
+        "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+      }
+    ],
+    "element_type": "std::json"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/67.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/67.json
new file mode 100644
index 0000000..aa2041e
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/67.json
@@ -0,0 +1,51 @@
+{
+  "name": "Query result of type set<std::bool>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { false, false, true, true, false, true, false }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "std::bool",
+        "value": false
+      },
+      {
+        "type": "std::bool",
+        "value": false
+      },
+      {
+        "type": "std::bool",
+        "value": true
+      },
+      {
+        "type": "std::bool",
+        "value": true
+      },
+      {
+        "type": "std::bool",
+        "value": false
+      },
+      {
+        "type": "std::bool",
+        "value": true
+      },
+      {
+        "type": "std::bool",
+        "value": false
+      }
+    ],
+    "element_type": "std::bool"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/68.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/68.json
new file mode 100644
index 0000000..c8b6e8a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/68.json
@@ -0,0 +1,39 @@
+{
+  "name": "Query result of type set<std::bool>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { false, true, true, true }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "std::bool",
+        "value": false
+      },
+      {
+        "type": "std::bool",
+        "value": true
+      },
+      {
+        "type": "std::bool",
+        "value": true
+      },
+      {
+        "type": "std::bool",
+        "value": true
+      }
+    ],
+    "element_type": "std::bool"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/69.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/69.json
new file mode 100644
index 0000000..b5e4d9b
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/69.json
@@ -0,0 +1,95 @@
+{
+  "name": "Query result of type set<std::uuid>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <uuid>'d965aaae-5a7f-12c2-cf3b-4e8ebc5e2fc2', <uuid>'2fbf01d8-ba53-df14-ec79-eb3a47562972', <uuid>'4961ff5d-832b-064d-93a0-f76cbd449a67', <uuid>'a8ad589e-8915-f3ad-9585-ed056f87ca79', <uuid>'bd30db11-e5fc-5496-b4b8-9bb2c3a822a8', <uuid>'ee9c83de-81a8-d35d-526e-b4a69648960b', <uuid>'e15b7ed6-dd13-b96b-c258-f45ceefa30ec', <uuid>'eb264562-dbeb-8fd0-7e5c-6a8e30f0bd6c', <uuid>'44dc8f22-404d-0194-17e3-2c508c00e558', <uuid>'5143c73d-aa21-fa20-aecb-62b673dd88d1', <uuid>'5e3a889b-ec1d-219f-b025-d408ae80037e', <uuid>'69501277-6cad-774a-6fe1-9682dedd8e3a', <uuid>'03b55a5a-86c5-513a-2821-a0fcd6174c2e', <uuid>'603fe4c7-1f8c-2e24-3dc3-ef3c551c43d3', <uuid>'54ad9997-ffca-f0b8-d7ff-408ccb4ea057', <uuid>'fabb6895-2d9e-3bad-3686-c50297fefb0b', <uuid>'3c65cddd-f769-c763-2b4e-888dde9863ef', <uuid>'eda69722-4961-6935-ec71-1e4439b659d9' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "std::uuid",
+        "value": "d965aaae-5a7f-12c2-cf3b-4e8ebc5e2fc2"
+      },
+      {
+        "type": "std::uuid",
+        "value": "2fbf01d8-ba53-df14-ec79-eb3a47562972"
+      },
+      {
+        "type": "std::uuid",
+        "value": "4961ff5d-832b-064d-93a0-f76cbd449a67"
+      },
+      {
+        "type": "std::uuid",
+        "value": "a8ad589e-8915-f3ad-9585-ed056f87ca79"
+      },
+      {
+        "type": "std::uuid",
+        "value": "bd30db11-e5fc-5496-b4b8-9bb2c3a822a8"
+      },
+      {
+        "type": "std::uuid",
+        "value": "ee9c83de-81a8-d35d-526e-b4a69648960b"
+      },
+      {
+        "type": "std::uuid",
+        "value": "e15b7ed6-dd13-b96b-c258-f45ceefa30ec"
+      },
+      {
+        "type": "std::uuid",
+        "value": "eb264562-dbeb-8fd0-7e5c-6a8e30f0bd6c"
+      },
+      {
+        "type": "std::uuid",
+        "value": "44dc8f22-404d-0194-17e3-2c508c00e558"
+      },
+      {
+        "type": "std::uuid",
+        "value": "5143c73d-aa21-fa20-aecb-62b673dd88d1"
+      },
+      {
+        "type": "std::uuid",
+        "value": "5e3a889b-ec1d-219f-b025-d408ae80037e"
+      },
+      {
+        "type": "std::uuid",
+        "value": "69501277-6cad-774a-6fe1-9682dedd8e3a"
+      },
+      {
+        "type": "std::uuid",
+        "value": "03b55a5a-86c5-513a-2821-a0fcd6174c2e"
+      },
+      {
+        "type": "std::uuid",
+        "value": "603fe4c7-1f8c-2e24-3dc3-ef3c551c43d3"
+      },
+      {
+        "type": "std::uuid",
+        "value": "54ad9997-ffca-f0b8-d7ff-408ccb4ea057"
+      },
+      {
+        "type": "std::uuid",
+        "value": "fabb6895-2d9e-3bad-3686-c50297fefb0b"
+      },
+      {
+        "type": "std::uuid",
+        "value": "3c65cddd-f769-c763-2b4e-888dde9863ef"
+      },
+      {
+        "type": "std::uuid",
+        "value": "eda69722-4961-6935-ec71-1e4439b659d9"
+      }
+    ],
+    "element_type": "std::uuid"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/7.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/7.json
new file mode 100644
index 0000000..0125757
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/7.json
@@ -0,0 +1,77 @@
+{
+  "name": "Query result of type array<std::int32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<int32>2039341380, <int32>1474781027, <int32>2099981448, <int32>1160045913, <int32>1373507931, <int32>1207479498, <int32>526705488, <int32>1752042315, <int32>1765846085, <int32>647802229, <int32>1695969909, <int32>1112844924, <int32>284523456]",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::int32",
+          "value": 2039341380
+        },
+        {
+          "type": "std::int32",
+          "value": 1474781027
+        },
+        {
+          "type": "std::int32",
+          "value": 2099981448
+        },
+        {
+          "type": "std::int32",
+          "value": 1160045913
+        },
+        {
+          "type": "std::int32",
+          "value": 1373507931
+        },
+        {
+          "type": "std::int32",
+          "value": 1207479498
+        },
+        {
+          "type": "std::int32",
+          "value": 526705488
+        },
+        {
+          "type": "std::int32",
+          "value": 1752042315
+        },
+        {
+          "type": "std::int32",
+          "value": 1765846085
+        },
+        {
+          "type": "std::int32",
+          "value": 647802229
+        },
+        {
+          "type": "std::int32",
+          "value": 1695969909
+        },
+        {
+          "type": "std::int32",
+          "value": 1112844924
+        },
+        {
+          "type": "std::int32",
+          "value": 284523456
+        }
+      ],
+      "element_type": "std::int32"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/70.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/70.json
new file mode 100644
index 0000000..aa6cfd6
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/70.json
@@ -0,0 +1,75 @@
+{
+  "name": "Query result of type set<cal::local_date>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <cal::local_date>'1052-08-04', <cal::local_date>'6183-04-19', <cal::local_date>'1257-06-17', <cal::local_date>'3486-07-26', <cal::local_date>'8981-11-18', <cal::local_date>'9952-12-14', <cal::local_date>'7949-10-20', <cal::local_date>'7617-10-17', <cal::local_date>'3816-10-03', <cal::local_date>'6924-10-20', <cal::local_date>'2873-06-20', <cal::local_date>'4618-10-20', <cal::local_date>'8622-07-03' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "cal::local_date",
+        "value": "1052-08-04"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "6183-04-19"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "1257-06-17"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "3486-07-26"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "8981-11-18"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "9952-12-14"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "7949-10-20"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "7617-10-17"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "3816-10-03"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "6924-10-20"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "2873-06-20"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "4618-10-20"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "8622-07-03"
+      }
+    ],
+    "element_type": "cal::local_date"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/71.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/71.json
new file mode 100644
index 0000000..22258a0
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/71.json
@@ -0,0 +1,63 @@
+{
+  "name": "Query result of type set<cal::local_date>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <cal::local_date>'6854-01-12', <cal::local_date>'4127-05-05', <cal::local_date>'3774-08-12', <cal::local_date>'1293-12-12', <cal::local_date>'5742-02-21', <cal::local_date>'5551-09-29', <cal::local_date>'9064-11-29', <cal::local_date>'3688-08-26', <cal::local_date>'8520-10-28', <cal::local_date>'2216-11-19' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "cal::local_date",
+        "value": "6854-01-12"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "4127-05-05"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "3774-08-12"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "1293-12-12"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "5742-02-21"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "5551-09-29"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "9064-11-29"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "3688-08-26"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "8520-10-28"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "2216-11-19"
+      }
+    ],
+    "element_type": "cal::local_date"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/72.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/72.json
new file mode 100644
index 0000000..8e8c0e2
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/72.json
@@ -0,0 +1,39 @@
+{
+  "name": "Query result of type set<cal::local_date>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT { <cal::local_date>'3591-11-27', <cal::local_date>'9715-06-06', <cal::local_date>'6999-06-18', <cal::local_date>'0401-02-08' }",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": {
+    "type": "set",
+    "value": [
+      {
+        "type": "cal::local_date",
+        "value": "3591-11-27"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "9715-06-06"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "6999-06-18"
+      },
+      {
+        "type": "cal::local_date",
+        "value": "0401-02-08"
+      }
+    ],
+    "element_type": "cal::local_date"
+  }
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/73.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/73.json
new file mode 100644
index 0000000..ed353a9
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/73.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::str",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT 'KSZADVZFZDVYAZY'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::str",
+      "value": "KSZADVZFZDVYAZY"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/74.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/74.json
new file mode 100644
index 0000000..39a1bb6
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/74.json
@@ -0,0 +1,32 @@
+{
+  "name": "Query result of type tuple<cal::local_time, std::duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (<cal::local_time>'21:48:51.3101560', <duration>'22723200 seconds')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "tuple",
+      "value": [
+        {
+          "type": "cal::local_time",
+          "value": "21:48:51.3101560"
+        },
+        {
+          "type": "std::duration",
+          "value": "263.00:00:00"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/75.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/75.json
new file mode 100644
index 0000000..09e01e1
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/75.json
@@ -0,0 +1,32 @@
+{
+  "name": "Query result of type tuple<cal::local_time, std::duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (<cal::local_time>'23:27:54.0913750', <duration>'17712000 seconds')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "tuple",
+      "value": [
+        {
+          "type": "cal::local_time",
+          "value": "23:27:54.0913750"
+        },
+        {
+          "type": "std::duration",
+          "value": "205.00:00:00"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/76.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/76.json
new file mode 100644
index 0000000..062c1a8
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/76.json
@@ -0,0 +1,32 @@
+{
+  "name": "Query result of type tuple<std::duration, cal::local_time>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (<duration>'38880000 seconds', <cal::local_time>'04:38:13.4939220')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "tuple",
+      "value": [
+        {
+          "type": "std::duration",
+          "value": "450.00:00:00"
+        },
+        {
+          "type": "cal::local_time",
+          "value": "04:38:13.4939220"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/77.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/77.json
new file mode 100644
index 0000000..3bf0149
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/77.json
@@ -0,0 +1,32 @@
+{
+  "name": "Query result of type tuple<std::duration, cal::local_time>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT (<duration>'34560000 seconds', <cal::local_time>'19:44:15.9055780')",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "tuple",
+      "value": [
+        {
+          "type": "std::duration",
+          "value": "400.00:00:00"
+        },
+        {
+          "type": "cal::local_time",
+          "value": "19:44:15.9055780"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/78.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/78.json
new file mode 100644
index 0000000..8f8e49e
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/78.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::uuid",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <uuid>'1a8af582-ee65-f613-c4e5-655a59f595b4'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::uuid",
+      "value": "1a8af582-ee65-f613-c4e5-655a59f595b4"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/79.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/79.json
new file mode 100644
index 0000000..d971502
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/79.json
@@ -0,0 +1,205 @@
+{
+  "name": "Query result of type array<range<std::int32>>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [range(<int32>1579098446, <int32>2091180324), range(<int32>734505788, <int32>1892599064), range(<int32>575458738, <int32>1250980149), range(<int32>1785970819, <int32>1996039959), range(<int32>932013739, <int32>1556413508), range(<int32>453031683, <int32>1376301320), range(<int32>1454000672, <int32>2127971583), range(<int32>1156675891, <int32>1581601488), range(<int32>846830926, <int32>1900337921), range(<int32>1365969587, <int32>1491598264), range(<int32>1519117711, <int32>1732014442), range(<int32>1252421351, <int32>1693799482), range(<int32>1492593341, <int32>1678271432), range(<int32>1202740737, <int32>1858697109), range(<int32>1771731172, <int32>1903666981), range(<int32>1241849445, <int32>1608880268), range(<int32>1437909403, <int32>2050365156), range(<int32>602498460, <int32>1201424067)]",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "range",
+          "value": {
+            "lower": 1579098446,
+            "upper": 2091180324,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 734505788,
+            "upper": 1892599064,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 575458738,
+            "upper": 1250980149,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 1785970819,
+            "upper": 1996039959,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 932013739,
+            "upper": 1556413508,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 453031683,
+            "upper": 1376301320,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 1454000672,
+            "upper": 2127971583,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 1156675891,
+            "upper": 1581601488,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 846830926,
+            "upper": 1900337921,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 1365969587,
+            "upper": 1491598264,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 1519117711,
+            "upper": 1732014442,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 1252421351,
+            "upper": 1693799482,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 1492593341,
+            "upper": 1678271432,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 1202740737,
+            "upper": 1858697109,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 1771731172,
+            "upper": 1903666981,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 1241849445,
+            "upper": 1608880268,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 1437909403,
+            "upper": 2050365156,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 602498460,
+            "upper": 1201424067,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        }
+      ],
+      "element_type": "range"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/8.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/8.json
new file mode 100644
index 0000000..adc5b16
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/8.json
@@ -0,0 +1,49 @@
+{
+  "name": "Query result of type array<std::json>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}')]",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        },
+        {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        },
+        {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        },
+        {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        },
+        {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        },
+        {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        }
+      ],
+      "element_type": "std::json"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/80.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/80.json
new file mode 100644
index 0000000..63500a6
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/80.json
@@ -0,0 +1,45 @@
+{
+  "name": "Query result of type array<std::str>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT ['QNZSRTDOMBXKTAQ', 'WRXAZWCDWFUJBSA', 'JAQQPIMRDEZWSLG', 'PCOBFZYTLVVLYTM', 'AJASJZKNEFXVWGK']",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::str",
+          "value": "QNZSRTDOMBXKTAQ"
+        },
+        {
+          "type": "std::str",
+          "value": "WRXAZWCDWFUJBSA"
+        },
+        {
+          "type": "std::str",
+          "value": "JAQQPIMRDEZWSLG"
+        },
+        {
+          "type": "std::str",
+          "value": "PCOBFZYTLVVLYTM"
+        },
+        {
+          "type": "std::str",
+          "value": "AJASJZKNEFXVWGK"
+        }
+      ],
+      "element_type": "std::str"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/81.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/81.json
new file mode 100644
index 0000000..580d2a6
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/81.json
@@ -0,0 +1,69 @@
+{
+  "name": "Query result of type array<std::int16>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<int16>24407, <int16>24566, <int16>30737, <int16>4375, <int16>32226, <int16>11824, <int16>13201, <int16>3512, <int16>28853, <int16>6579, <int16>24483]",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::int16",
+          "value": 24407
+        },
+        {
+          "type": "std::int16",
+          "value": 24566
+        },
+        {
+          "type": "std::int16",
+          "value": 30737
+        },
+        {
+          "type": "std::int16",
+          "value": 4375
+        },
+        {
+          "type": "std::int16",
+          "value": 32226
+        },
+        {
+          "type": "std::int16",
+          "value": 11824
+        },
+        {
+          "type": "std::int16",
+          "value": 13201
+        },
+        {
+          "type": "std::int16",
+          "value": 3512
+        },
+        {
+          "type": "std::int16",
+          "value": 28853
+        },
+        {
+          "type": "std::int16",
+          "value": 6579
+        },
+        {
+          "type": "std::int16",
+          "value": 24483
+        }
+      ],
+      "element_type": "std::int16"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/82.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/82.json
new file mode 100644
index 0000000..4ffc990
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/82.json
@@ -0,0 +1,73 @@
+{
+  "name": "Query result of type array<std::int64>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<std::int64>7733368487018875698, <std::int64>4931304340547399918, <std::int64>6418954383898570375, <std::int64>8948492986447133603, <std::int64>8172046372040799034, <std::int64>3947619853428754802, <std::int64>101790139850640365, <std::int64>359220579717475857, <std::int64>5533319829945048321, <std::int64>6157870107590645121, <std::int64>4423037604707005022, <std::int64>6179019042543695282]",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::int64",
+          "value": 7733368487018875698
+        },
+        {
+          "type": "std::int64",
+          "value": 4931304340547399918
+        },
+        {
+          "type": "std::int64",
+          "value": 6418954383898570375
+        },
+        {
+          "type": "std::int64",
+          "value": 8948492986447133603
+        },
+        {
+          "type": "std::int64",
+          "value": 8172046372040799034
+        },
+        {
+          "type": "std::int64",
+          "value": 3947619853428754802
+        },
+        {
+          "type": "std::int64",
+          "value": 101790139850640365
+        },
+        {
+          "type": "std::int64",
+          "value": 359220579717475857
+        },
+        {
+          "type": "std::int64",
+          "value": 5533319829945048321
+        },
+        {
+          "type": "std::int64",
+          "value": 6157870107590645121
+        },
+        {
+          "type": "std::int64",
+          "value": 4423037604707005022
+        },
+        {
+          "type": "std::int64",
+          "value": 6179019042543695282
+        }
+      ],
+      "element_type": "std::int64"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/83.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/83.json
new file mode 100644
index 0000000..16d90b4
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/83.json
@@ -0,0 +1,395 @@
+{
+  "name": "Query result of type array<tuple<std::float32, cal::local_time, std::json, std::str, std::uuid, std::int64, std::duration, std::float64>>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [(<float32>-19.372057n, <cal::local_time>'22:00:11.9369380', std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), 'ZPYEACPSGNWHFCK', <uuid>'d3b50507-40bd-3305-376a-eeb453b8efa4', <std::int64>6365917789054965460, <duration>'259200 seconds', <float64>5.400128211081087n), (<float32>9.601582n, <cal::local_time>'22:14:19.0955310', std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), 'NHPCMNSOPSPJJCN', <uuid>'beec3d81-710e-a23e-ecf7-818bfcf248c7', <std::int64>4542252497680397592, <duration>'42768000 seconds', <float64>11.651557789487558n), (<float32>17.968422n, <cal::local_time>'20:15:09.7633440', std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), 'ZMIRZARTZMSIICK', <uuid>'359d057b-33af-dfdd-339d-888a14c1bd93', <std::int64>3931281410330760344, <duration>'9072000 seconds', <float64>14.273123877250182n), (<float32>-9.185147n, <cal::local_time>'03:08:18.2353280', std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), 'MPEQBLDCDRRGXVH', <uuid>'7c7be239-626e-59ef-8a7b-30be4c5b7c3f', <std::int64>3239347754896439487, <duration>'6912000 seconds', <float64>29.358406536913666n), (<float32>14.035652n, <cal::local_time>'04:02:49.7245620', std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), 'FHEHXXQKRYCIIUU', <uuid>'b39c3056-11cd-5012-daa6-d3d0d32d52c3', <std::int64>8218549278715073052, <duration>'26265600 seconds', <float64>6.545113734223467n), (<float32>-34.026962n, <cal::local_time>'17:11:02.4753120', std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), 'ODAVQXSEPRJAODE', <uuid>'9cc9c566-280f-fd20-7720-f1a7fb0c7701', <std::int64>2196153274214179721, <duration>'26179200 seconds', <float64>49.16468145007486n), (<float32>-4.0155416n, <cal::local_time>'17:26:14.4000310', std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), 'ENWAZOWMLVNAAWP', <uuid>'6312bebb-a5ec-e60c-22d5-4fddb0cda783', <std::int64>7136896832609267249, <duration>'2851200 seconds', <float64>52.75601913256386n), (<float32>30.81763n, <cal::local_time>'17:15:27.3914380', std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), 'YFFPAYMUYZNHTYO', <uuid>'0c38802a-4193-eecc-ccd0-150790cd3a7e', <std::int64>5316076112078266711, <duration>'27648000 seconds', <float64>1.1268104916097645n), (<float32>-4.5670886n, <cal::local_time>'07:23:41.8200880', std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), 'HSMHZALGDZNFLZK', <uuid>'ab36dfcb-cc95-cfec-729e-ca5307cc509a', <std::int64>852100454803668314, <duration>'39571200 seconds', <float64>-6.555586179045768n), (<float32>-52.2988n, <cal::local_time>'22:45:12.4195160', std::to_json('{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}'), 'YJJECTOAXGMZPDC', <uuid>'be03862d-5d8a-81a8-d974-9c7b73947f71', <std::int64>5008470431212368611, <duration>'28771200 seconds', <float64>3.9131380328504077n)]",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::float32",
+              "value": -19.372057
+            },
+            {
+              "type": "cal::local_time",
+              "value": "22:00:11.9369380"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::str",
+              "value": "ZPYEACPSGNWHFCK"
+            },
+            {
+              "type": "std::uuid",
+              "value": "d3b50507-40bd-3305-376a-eeb453b8efa4"
+            },
+            {
+              "type": "std::int64",
+              "value": 6365917789054965460
+            },
+            {
+              "type": "std::duration",
+              "value": "3.00:00:00"
+            },
+            {
+              "type": "std::float64",
+              "value": 5.400128211081087
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::float32",
+              "value": 9.601582
+            },
+            {
+              "type": "cal::local_time",
+              "value": "22:14:19.0955310"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::str",
+              "value": "NHPCMNSOPSPJJCN"
+            },
+            {
+              "type": "std::uuid",
+              "value": "beec3d81-710e-a23e-ecf7-818bfcf248c7"
+            },
+            {
+              "type": "std::int64",
+              "value": 4542252497680397592
+            },
+            {
+              "type": "std::duration",
+              "value": "495.00:00:00"
+            },
+            {
+              "type": "std::float64",
+              "value": 11.651557789487558
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::float32",
+              "value": 17.968422
+            },
+            {
+              "type": "cal::local_time",
+              "value": "20:15:09.7633440"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::str",
+              "value": "ZMIRZARTZMSIICK"
+            },
+            {
+              "type": "std::uuid",
+              "value": "359d057b-33af-dfdd-339d-888a14c1bd93"
+            },
+            {
+              "type": "std::int64",
+              "value": 3931281410330760344
+            },
+            {
+              "type": "std::duration",
+              "value": "105.00:00:00"
+            },
+            {
+              "type": "std::float64",
+              "value": 14.273123877250182
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::float32",
+              "value": -9.185147
+            },
+            {
+              "type": "cal::local_time",
+              "value": "03:08:18.2353280"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::str",
+              "value": "MPEQBLDCDRRGXVH"
+            },
+            {
+              "type": "std::uuid",
+              "value": "7c7be239-626e-59ef-8a7b-30be4c5b7c3f"
+            },
+            {
+              "type": "std::int64",
+              "value": 3239347754896439487
+            },
+            {
+              "type": "std::duration",
+              "value": "80.00:00:00"
+            },
+            {
+              "type": "std::float64",
+              "value": 29.358406536913666
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::float32",
+              "value": 14.035652
+            },
+            {
+              "type": "cal::local_time",
+              "value": "04:02:49.7245620"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::str",
+              "value": "FHEHXXQKRYCIIUU"
+            },
+            {
+              "type": "std::uuid",
+              "value": "b39c3056-11cd-5012-daa6-d3d0d32d52c3"
+            },
+            {
+              "type": "std::int64",
+              "value": 8218549278715073052
+            },
+            {
+              "type": "std::duration",
+              "value": "304.00:00:00"
+            },
+            {
+              "type": "std::float64",
+              "value": 6.545113734223467
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::float32",
+              "value": -34.026962
+            },
+            {
+              "type": "cal::local_time",
+              "value": "17:11:02.4753120"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::str",
+              "value": "ODAVQXSEPRJAODE"
+            },
+            {
+              "type": "std::uuid",
+              "value": "9cc9c566-280f-fd20-7720-f1a7fb0c7701"
+            },
+            {
+              "type": "std::int64",
+              "value": 2196153274214179721
+            },
+            {
+              "type": "std::duration",
+              "value": "303.00:00:00"
+            },
+            {
+              "type": "std::float64",
+              "value": 49.16468145007486
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::float32",
+              "value": -4.0155416
+            },
+            {
+              "type": "cal::local_time",
+              "value": "17:26:14.4000310"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::str",
+              "value": "ENWAZOWMLVNAAWP"
+            },
+            {
+              "type": "std::uuid",
+              "value": "6312bebb-a5ec-e60c-22d5-4fddb0cda783"
+            },
+            {
+              "type": "std::int64",
+              "value": 7136896832609267249
+            },
+            {
+              "type": "std::duration",
+              "value": "33.00:00:00"
+            },
+            {
+              "type": "std::float64",
+              "value": 52.75601913256386
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::float32",
+              "value": 30.81763
+            },
+            {
+              "type": "cal::local_time",
+              "value": "17:15:27.3914380"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::str",
+              "value": "YFFPAYMUYZNHTYO"
+            },
+            {
+              "type": "std::uuid",
+              "value": "0c38802a-4193-eecc-ccd0-150790cd3a7e"
+            },
+            {
+              "type": "std::int64",
+              "value": 5316076112078266711
+            },
+            {
+              "type": "std::duration",
+              "value": "320.00:00:00"
+            },
+            {
+              "type": "std::float64",
+              "value": 1.1268104916097645
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::float32",
+              "value": -4.5670886
+            },
+            {
+              "type": "cal::local_time",
+              "value": "07:23:41.8200880"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::str",
+              "value": "HSMHZALGDZNFLZK"
+            },
+            {
+              "type": "std::uuid",
+              "value": "ab36dfcb-cc95-cfec-729e-ca5307cc509a"
+            },
+            {
+              "type": "std::int64",
+              "value": 852100454803668314
+            },
+            {
+              "type": "std::duration",
+              "value": "458.00:00:00"
+            },
+            {
+              "type": "std::float64",
+              "value": -6.555586179045768
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::float32",
+              "value": -52.2988
+            },
+            {
+              "type": "cal::local_time",
+              "value": "22:45:12.4195160"
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "std::str",
+              "value": "YJJECTOAXGMZPDC"
+            },
+            {
+              "type": "std::uuid",
+              "value": "be03862d-5d8a-81a8-d974-9c7b73947f71"
+            },
+            {
+              "type": "std::int64",
+              "value": 5008470431212368611
+            },
+            {
+              "type": "std::duration",
+              "value": "333.00:00:00"
+            },
+            {
+              "type": "std::float64",
+              "value": 3.9131380328504077
+            }
+          ]
+        }
+      ],
+      "element_type": "tuple"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/84.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/84.json
new file mode 100644
index 0000000..58e862a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/84.json
@@ -0,0 +1,65 @@
+{
+  "name": "Query result of type array<std::float64>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<float64>52.37219361698823n, <float64>-3.5331031547547798n, <float64>26.229998202170247n, <float64>-24.394875184816716n, <float64>6.120853311438511n, <float64>-62.739022051328334n, <float64>-39.631367429919244n, <float64>-9.775402697629948n, <float64>4.066333041557265n, <float64>1.0908446042290165n]",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::float64",
+          "value": 52.37219361698823
+        },
+        {
+          "type": "std::float64",
+          "value": -3.5331031547547798
+        },
+        {
+          "type": "std::float64",
+          "value": 26.229998202170247
+        },
+        {
+          "type": "std::float64",
+          "value": -24.394875184816716
+        },
+        {
+          "type": "std::float64",
+          "value": 6.120853311438511
+        },
+        {
+          "type": "std::float64",
+          "value": -62.739022051328334
+        },
+        {
+          "type": "std::float64",
+          "value": -39.631367429919244
+        },
+        {
+          "type": "std::float64",
+          "value": -9.775402697629948
+        },
+        {
+          "type": "std::float64",
+          "value": 4.066333041557265
+        },
+        {
+          "type": "std::float64",
+          "value": 1.0908446042290165
+        }
+      ],
+      "element_type": "std::float64"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/85.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/85.json
new file mode 100644
index 0000000..6593f28
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/85.json
@@ -0,0 +1,53 @@
+{
+  "name": "Query result of type array<cal::date_duration>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<cal::date_duration>'-29923 days', <cal::date_duration>'13658 days', <cal::date_duration>'-7943 days', <cal::date_duration>'-11068 days', <cal::date_duration>'-9566 days', <cal::date_duration>'21052 days', <cal::date_duration>'-20707 days']",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "cal::date_duration",
+          "value": "-29923.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "13658.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "-7943.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "-11068.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "-9566.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "21052.00:00:00"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "-20707.00:00:00"
+        }
+      ],
+      "element_type": "cal::date_duration"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/86.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/86.json
new file mode 100644
index 0000000..5faa14d
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/86.json
@@ -0,0 +1,257 @@
+{
+  "name": "Query result of type array<namedtuple<std::datetime, std::duration, std::str, cal::date_duration, std::uuid, std::float32>>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [(XPEZRQLNVRQHHCJ := <datetime>'8181-03-30T14:34:15.564992-03:00', YBURQSULQEGEVPF := <duration>'22204800 seconds', PIBTIDRIHWULQLK := 'TEUBCGXKNAMFIAB', TAMBUKQXDIIVZAA := <cal::date_duration>'-23456 days', CLKLEIKQFHRLAHU := <uuid>'6bd1a634-c986-1af9-369d-5f5b41ed530f', JCXQAHVEQDEJGRI := <float32>-0.15380102n), (LTLBSXOOKKIFSGX := <datetime>'0698-09-20T12:30:00.257088-03:00', JEJJTUTAEEQFLWB := <duration>'36633600 seconds', PZYAFTLTLTHYLCI := 'KRWFARYSAOTYIZN', IORYDXEKYPIBLCS := <cal::date_duration>'-1796 days', AEEQDXAFZRANLLG := <uuid>'b2810e0e-e773-0a4b-64c3-ef9cb3d64696', QSYICSLUXYXNKKE := <float32>69.19877n), (VQXDMRSITODYBVI := <datetime>'9107-06-22T05:36:54.425056-03:00', NXXXMQNOQABXGMD := <duration>'36979200 seconds', ZBSPLRJJRGTZWRC := 'MJXNPJAKOWRRLNC', CPWHFCBGNNUKTOU := <cal::date_duration>'11217 days', UCGJWPAHBPZSYED := <uuid>'55851476-6561-8921-0119-d0bc1546d0be', SATZTTTHGXBMGVP := <float32>-14.20867n), (NODDKUPJTZKQBMR := <datetime>'9905-12-15T04:58:01.836128-04:00', LEZENNOJHWJDMAJ := <duration>'30412800 seconds', PTOXIFEJZHVHAZP := 'SDCZMZBPUCXGFGZ', XRXXLACYVVOFSBH := <cal::date_duration>'29285 days', UWHTWPSZDFHXDSI := <uuid>'d83a780b-9f99-8840-a103-083000c9a26d', MXLCTEVHELWXRXR := <float32>-73.482765n), (ZVCXCVEPFEWCKKH := <datetime>'4560-04-20T15:16:18.656304-03:00', GFBFNTMYVDLFZOZ := <duration>'41040000 seconds', WEJAJHOPPCIJLMK := 'MPQWMLBPYHRSJGP', DKOCCEXYMPXREPJ := <cal::date_duration>'22297 days', MZICNKCTBBPVFJM := <uuid>'70446454-931c-7a3a-5311-3d75d87c69cb', RPUQOBXEZICWJRK := <float32>-8.911645n), (HUTKEHQSQWSISCP := <datetime>'1598-05-31T19:55:01.83361-03:00', PWWEESIBFVISNZG := <duration>'29980800 seconds', QFXFPIYIGIHZKTU := 'TZHWFDBLIZMHADW', QSLJGKZNYVXKBBU := <cal::date_duration>'2323 days', TAYVUNEMWPWQHDM := <uuid>'5c55507b-a854-58fc-509d-4201c5343479', TVKWMVXYFTOJQHN := <float32>73.91387n), (CTDYKAEWLHNCPKM := <datetime>'8942-09-29T02:29:43.904256-03:00', TQINUJFMUQDQVKS := <duration>'7516800 seconds', CQQXZVIYLQSRZYE := 'CBIWFHKXLPKAFPX', XBHWHOTUAPITNVV := <cal::date_duration>'22060 days', TJKHJVGSMJLISWT := <uuid>'41be3db7-2fc3-e4da-274e-987c62f11e47', AZWNJQSMQOBJISW := <float32>0n), (XARDFAWLTXPJWPT := <datetime>'2724-02-06T17:44:07.18878-04:00', ZFODGEROMZFETLQ := <duration>'32832000 seconds', XRJWRMMEYPAFEUP := 'DNUBYRWAOTBRGZL', PJRBXWISCYHPRJH := <cal::date_duration>'6194 days', PXVSPGVJHYLVYYD := <uuid>'cdb119f0-d476-77fa-9c50-d28694228e18', BMKNDWTLFOPKHHA := <float32>-14.2918005n)]",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::datetime",
+              "value": "8181-03-30T14:34:15.564992-03:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "257.00:00:00"
+            },
+            {
+              "type": "std::str",
+              "value": "TEUBCGXKNAMFIAB"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-23456.00:00:00"
+            },
+            {
+              "type": "std::uuid",
+              "value": "6bd1a634-c986-1af9-369d-5f5b41ed530f"
+            },
+            {
+              "type": "std::float32",
+              "value": -0.15380102
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::datetime",
+              "value": "0698-09-20T12:30:00.257088-03:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "424.00:00:00"
+            },
+            {
+              "type": "std::str",
+              "value": "KRWFARYSAOTYIZN"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-1796.00:00:00"
+            },
+            {
+              "type": "std::uuid",
+              "value": "b2810e0e-e773-0a4b-64c3-ef9cb3d64696"
+            },
+            {
+              "type": "std::float32",
+              "value": 69.19877
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::datetime",
+              "value": "9107-06-22T05:36:54.425056-03:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "428.00:00:00"
+            },
+            {
+              "type": "std::str",
+              "value": "MJXNPJAKOWRRLNC"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "11217.00:00:00"
+            },
+            {
+              "type": "std::uuid",
+              "value": "55851476-6561-8921-0119-d0bc1546d0be"
+            },
+            {
+              "type": "std::float32",
+              "value": -14.20867
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::datetime",
+              "value": "9905-12-15T04:58:01.836128-04:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "352.00:00:00"
+            },
+            {
+              "type": "std::str",
+              "value": "SDCZMZBPUCXGFGZ"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "29285.00:00:00"
+            },
+            {
+              "type": "std::uuid",
+              "value": "d83a780b-9f99-8840-a103-083000c9a26d"
+            },
+            {
+              "type": "std::float32",
+              "value": -73.482765
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::datetime",
+              "value": "4560-04-20T15:16:18.656304-03:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "475.00:00:00"
+            },
+            {
+              "type": "std::str",
+              "value": "MPQWMLBPYHRSJGP"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "22297.00:00:00"
+            },
+            {
+              "type": "std::uuid",
+              "value": "70446454-931c-7a3a-5311-3d75d87c69cb"
+            },
+            {
+              "type": "std::float32",
+              "value": -8.911645
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::datetime",
+              "value": "1598-05-31T19:55:01.83361-03:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "347.00:00:00"
+            },
+            {
+              "type": "std::str",
+              "value": "TZHWFDBLIZMHADW"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "2323.00:00:00"
+            },
+            {
+              "type": "std::uuid",
+              "value": "5c55507b-a854-58fc-509d-4201c5343479"
+            },
+            {
+              "type": "std::float32",
+              "value": 73.91387
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::datetime",
+              "value": "8942-09-29T02:29:43.904256-03:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "87.00:00:00"
+            },
+            {
+              "type": "std::str",
+              "value": "CBIWFHKXLPKAFPX"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "22060.00:00:00"
+            },
+            {
+              "type": "std::uuid",
+              "value": "41be3db7-2fc3-e4da-274e-987c62f11e47"
+            },
+            {
+              "type": "std::float32",
+              "value": 0.0
+            }
+          ]
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::datetime",
+              "value": "2724-02-06T17:44:07.18878-04:00"
+            },
+            {
+              "type": "std::duration",
+              "value": "380.00:00:00"
+            },
+            {
+              "type": "std::str",
+              "value": "DNUBYRWAOTBRGZL"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "6194.00:00:00"
+            },
+            {
+              "type": "std::uuid",
+              "value": "cdb119f0-d476-77fa-9c50-d28694228e18"
+            },
+            {
+              "type": "std::float32",
+              "value": -14.2918005
+            }
+          ]
+        }
+      ],
+      "element_type": "namedtuple"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/87.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/87.json
new file mode 100644
index 0000000..3dd410f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/87.json
@@ -0,0 +1,85 @@
+{
+  "name": "Query result of type array<std::datetime>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [<datetime>'0950-01-19T09:27:25.74482-04:00', <datetime>'0413-11-09T17:21:51.378528-04:00', <datetime>'2501-11-14T20:09:48.776092-04:00', <datetime>'3292-11-07T21:19:04.248432-04:00', <datetime>'7210-01-06T16:03:27.63232-04:00', <datetime>'7417-10-01T06:25:48.029408-03:00', <datetime>'7575-04-16T17:32:37.097376-03:00', <datetime>'5777-10-28T03:41:00.303024-03:00', <datetime>'8746-05-31T10:32:14.809856-03:00', <datetime>'5480-04-22T14:47:43.325248-03:00', <datetime>'0132-11-27T02:43:41.030424-04:00', <datetime>'0657-09-14T20:34:05.911304-03:00', <datetime>'4741-03-25T21:39:01.38512-03:00', <datetime>'5414-09-20T06:43:50.960784-03:00', <datetime>'7374-11-08T20:19:37.918208-04:00']",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::datetime",
+          "value": "0950-01-19T09:27:25.74482-04:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "0413-11-09T17:21:51.378528-04:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "2501-11-14T20:09:48.776092-04:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "3292-11-07T21:19:04.248432-04:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "7210-01-06T16:03:27.63232-04:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "7417-10-01T06:25:48.029408-03:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "7575-04-16T17:32:37.097376-03:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "5777-10-28T03:41:00.303024-03:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "8746-05-31T10:32:14.809856-03:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "5480-04-22T14:47:43.325248-03:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "0132-11-27T02:43:41.030424-04:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "0657-09-14T20:34:05.911304-03:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "4741-03-25T21:39:01.38512-03:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "5414-09-20T06:43:50.960784-03:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "7374-11-08T20:19:37.918208-04:00"
+        }
+      ],
+      "element_type": "std::datetime"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/88.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/88.json
new file mode 100644
index 0000000..256df2b
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/88.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::bigint",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bigint>-5751795447030302288n",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bigint",
+      "value": -5751795447030302288
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/89.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/89.json
new file mode 100644
index 0000000..d2c8e71
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/89.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::bool",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT false",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bool",
+      "value": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/9.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/9.json
new file mode 100644
index 0000000..53310d3
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/9.json
@@ -0,0 +1,93 @@
+{
+  "name": "Query result of type array<std::bytes>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT [b'65AYG4GLI01DNXTKI2', b'5OKHQL3BM02', b'VTABCP7WR89Q', b'PECE9B3SNZPVW', b'NO25MQ2EUMVQ5LF', b'8Q45BG18N80ZH4VQ', b'7TIZCW0VLUZTRG', b'NZ3923SGX5QORB', b'12FA9380545IZWAO62S', b'SBWYXNNU5WIRU', b'49NRIYPZ8F8T3T', b'QUX0ZNZEQNUONEIV', b'YL4CAOS473DR2', b'V48OBUS5AE', b'8DXJCVZTV6Q1UPGEG4', b'VXYK0VQZHA45KYJ', b'L6T4HO9FIE']",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::bytes",
+          "value": "NjVBWUc0R0xJMDFETlhUS0ky"
+        },
+        {
+          "type": "std::bytes",
+          "value": "NU9LSFFMM0JNMDI="
+        },
+        {
+          "type": "std::bytes",
+          "value": "VlRBQkNQN1dSODlR"
+        },
+        {
+          "type": "std::bytes",
+          "value": "UEVDRTlCM1NOWlBWVw=="
+        },
+        {
+          "type": "std::bytes",
+          "value": "Tk8yNU1RMkVVTVZRNUxG"
+        },
+        {
+          "type": "std::bytes",
+          "value": "OFE0NUJHMThOODBaSDRWUQ=="
+        },
+        {
+          "type": "std::bytes",
+          "value": "N1RJWkNXMFZMVVpUUkc="
+        },
+        {
+          "type": "std::bytes",
+          "value": "TlozOTIzU0dYNVFPUkI="
+        },
+        {
+          "type": "std::bytes",
+          "value": "MTJGQTkzODA1NDVJWldBTzYyUw=="
+        },
+        {
+          "type": "std::bytes",
+          "value": "U0JXWVhOTlU1V0lSVQ=="
+        },
+        {
+          "type": "std::bytes",
+          "value": "NDlOUklZUFo4RjhUM1Q="
+        },
+        {
+          "type": "std::bytes",
+          "value": "UVVYMFpOWkVRTlVPTkVJVg=="
+        },
+        {
+          "type": "std::bytes",
+          "value": "WUw0Q0FPUzQ3M0RSMg=="
+        },
+        {
+          "type": "std::bytes",
+          "value": "VjQ4T0JVUzVBRQ=="
+        },
+        {
+          "type": "std::bytes",
+          "value": "OERYSkNWWlRWNlExVVBHRUc0"
+        },
+        {
+          "type": "std::bytes",
+          "value": "VlhZSzBWUVpIQTQ1S1lK"
+        },
+        {
+          "type": "std::bytes",
+          "value": "TDZUNEhPOUZJRQ=="
+        }
+      ],
+      "element_type": "std::bytes"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/90.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/90.json
new file mode 100644
index 0000000..29e51bb
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/90.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::bytes",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT b'4YAC42RA3BIC4NEGTY'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bytes",
+      "value": "NFlBQzQyUkEzQklDNE5FR1RZ"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/91.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/91.json
new file mode 100644
index 0000000..0e13077
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/91.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type cal::date_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::date_duration>'17983 days'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::date_duration",
+      "value": "17983.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/92.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/92.json
new file mode 100644
index 0000000..c3384ed
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/92.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <datetime>'9197-08-08T07:00:21.39312-03:00'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::datetime",
+      "value": "9197-08-08T07:00:21.39312-03:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/93.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/93.json
new file mode 100644
index 0000000..bd962da
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/93.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::decimal",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::decimal>39.240675320960917n",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::decimal",
+      "value": 39.240675320960917
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/94.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/94.json
new file mode 100644
index 0000000..b1122ef
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/94.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <duration>'24278400 seconds'",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::duration",
+      "value": "281.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/95.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/95.json
new file mode 100644
index 0000000..735bab5
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/95.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::float32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <float32>64.90535n",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float32",
+      "value": 64.90535
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/96.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/96.json
new file mode 100644
index 0000000..e7f1c59
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/96.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::float64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <float64>34.974890307977276n",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float64",
+      "value": 34.974890307977276
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/97.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/97.json
new file mode 100644
index 0000000..93e4c11
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/97.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::int16",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <int16>22964",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int16",
+      "value": 22964
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/98.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/98.json
new file mode 100644
index 0000000..0b9a685
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/98.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::int32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <int32>660406923",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int32",
+      "value": 660406923
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_query_results/99.json b/src/driver/src/test/java/shared/testdefs/v2_query_results/99.json
new file mode 100644
index 0000000..5470b53
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_query_results/99.json
@@ -0,0 +1,23 @@
+{
+  "name": "Query result of type std::int64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int64>8571519229245066352",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int64",
+      "value": 8571519229245066352
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state.json b/src/driver/src/test/java/shared/testdefs/v2_state.json
new file mode 100644
index 0000000..8522bcc
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state.json
@@ -0,0 +1,4 @@
+{
+  "protocol_version": "1.0",
+  "name": "V2 State"
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/0.json b/src/driver/src/test/java/shared/testdefs/v2_state/0.json
new file mode 100644
index 0000000..8412c4d
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/0.json
@@ -0,0 +1,200 @@
+{
+  "name": "Global of type array<std::bigint>",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global ZCNEVQOORZHBMMF -> array<std::bigint>",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type array<std::bigint>",
+      "cardinality": 109,
+      "value": "select global ZCNEVQOORZHBMMF",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "ZCNEVQOORZHBMMF": {
+            "type": "array",
+            "value": [
+              {
+                "type": "std::bigint",
+                "value": 1683471060357585966953401719466952
+              },
+              {
+                "type": "std::bigint",
+                "value": 1078594995
+              },
+              {
+                "type": "std::bigint",
+                "value": 4978808705160117705035637
+              },
+              {
+                "type": "std::bigint",
+                "value": -21032931613428405
+              },
+              {
+                "type": "std::bigint",
+                "value": 18685293397537
+              },
+              {
+                "type": "std::bigint",
+                "value": -82964411835772
+              },
+              {
+                "type": "std::bigint",
+                "value": 2016575164419795661550157035622
+              },
+              {
+                "type": "std::bigint",
+                "value": -2196457375204816284485
+              },
+              {
+                "type": "std::bigint",
+                "value": 1004899331322766491501
+              },
+              {
+                "type": "std::bigint",
+                "value": 478414862298742379683662
+              },
+              {
+                "type": "std::bigint",
+                "value": -1890903747444990898922095670397045
+              },
+              {
+                "type": "std::bigint",
+                "value": -4810849241313362122
+              },
+              {
+                "type": "std::bigint",
+                "value": 406762244173595159973148
+              },
+              {
+                "type": "std::bigint",
+                "value": -72470202616
+              },
+              {
+                "type": "std::bigint",
+                "value": -680306557
+              }
+            ],
+            "element_type": "std::bigint"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::bigint",
+          "value": 1683471060357585966953401719466952
+        },
+        {
+          "type": "std::bigint",
+          "value": 1078594995
+        },
+        {
+          "type": "std::bigint",
+          "value": 4978808705160117705035637
+        },
+        {
+          "type": "std::bigint",
+          "value": -21032931613428405
+        },
+        {
+          "type": "std::bigint",
+          "value": 18685293397537
+        },
+        {
+          "type": "std::bigint",
+          "value": -82964411835772
+        },
+        {
+          "type": "std::bigint",
+          "value": 2016575164419795661550157035622
+        },
+        {
+          "type": "std::bigint",
+          "value": -2196457375204816284485
+        },
+        {
+          "type": "std::bigint",
+          "value": 1004899331322766491501
+        },
+        {
+          "type": "std::bigint",
+          "value": 478414862298742379683662
+        },
+        {
+          "type": "std::bigint",
+          "value": -1890903747444990898922095670397045
+        },
+        {
+          "type": "std::bigint",
+          "value": -4810849241313362122
+        },
+        {
+          "type": "std::bigint",
+          "value": 406762244173595159973148
+        },
+        {
+          "type": "std::bigint",
+          "value": -72470202616
+        },
+        {
+          "type": "std::bigint",
+          "value": -680306557
+        }
+      ],
+      "element_type": "std::bigint"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/1.json b/src/driver/src/test/java/shared/testdefs/v2_state/1.json
new file mode 100644
index 0000000..fc47b39
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/1.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::bigint",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global KVFXANZZAQHZPUI -> std::bigint",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::bigint",
+      "cardinality": 109,
+      "value": "select global KVFXANZZAQHZPUI",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "KVFXANZZAQHZPUI": {
+            "type": "std::bigint",
+            "value": -691275568
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bigint",
+      "value": -691275568
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/10.json b/src/driver/src/test/java/shared/testdefs/v2_state/10.json
new file mode 100644
index 0000000..6781ee7
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/10.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::int16",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global XNWYHMIEGQPXJTU -> std::int16",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::int16",
+      "cardinality": 109,
+      "value": "select global XNWYHMIEGQPXJTU",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "XNWYHMIEGQPXJTU": {
+            "type": "std::int16",
+            "value": 26189
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int16",
+      "value": 26189
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/11.json b/src/driver/src/test/java/shared/testdefs/v2_state/11.json
new file mode 100644
index 0000000..93139b0
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/11.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::int32",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global PQOVWGJPRCNZEMB -> std::int32",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::int32",
+      "cardinality": 109,
+      "value": "select global PQOVWGJPRCNZEMB",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "PQOVWGJPRCNZEMB": {
+            "type": "std::int32",
+            "value": 256378984
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int32",
+      "value": 256378984
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/12.json b/src/driver/src/test/java/shared/testdefs/v2_state/12.json
new file mode 100644
index 0000000..7da0fde
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/12.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::int64",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global ANOWFDEUVTGEDEP -> std::int64",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::int64",
+      "cardinality": 109,
+      "value": "select global ANOWFDEUVTGEDEP",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "ANOWFDEUVTGEDEP": {
+            "type": "std::int64",
+            "value": 335210179237044142
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int64",
+      "value": 335210179237044142
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/13.json b/src/driver/src/test/java/shared/testdefs/v2_state/13.json
new file mode 100644
index 0000000..6f1cb31
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/13.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::json",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global VFKBHMJPKUFCDNT -> std::json",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::json",
+      "cardinality": 109,
+      "value": "select global VFKBHMJPKUFCDNT",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "VFKBHMJPKUFCDNT": {
+            "type": "std::json",
+            "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::json",
+      "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/14.json b/src/driver/src/test/java/shared/testdefs/v2_state/14.json
new file mode 100644
index 0000000..be9c7c7
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/14.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type cal::local_datetime",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global LCPBUJSSMOVLXKV -> cal::local_datetime",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type cal::local_datetime",
+      "cardinality": 109,
+      "value": "select global LCPBUJSSMOVLXKV",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "LCPBUJSSMOVLXKV": {
+            "type": "cal::local_datetime",
+            "value": "3750-06-17T14:54:05.6368240"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_datetime",
+      "value": "3750-06-17T14:54:05.6368240"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/15.json b/src/driver/src/test/java/shared/testdefs/v2_state/15.json
new file mode 100644
index 0000000..3357409
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/15.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type cal::local_date",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global GYPZBOEZLLYBQIZ -> cal::local_date",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type cal::local_date",
+      "cardinality": 109,
+      "value": "select global GYPZBOEZLLYBQIZ",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "GYPZBOEZLLYBQIZ": {
+            "type": "cal::local_date",
+            "value": "5813-03-09"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_date",
+      "value": "5813-03-09"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/16.json b/src/driver/src/test/java/shared/testdefs/v2_state/16.json
new file mode 100644
index 0000000..9b01460
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/16.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type cal::local_time",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global RCZRBWSIVYNENKJ -> cal::local_time",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type cal::local_time",
+      "cardinality": 109,
+      "value": "select global RCZRBWSIVYNENKJ",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "RCZRBWSIVYNENKJ": {
+            "type": "cal::local_time",
+            "value": "10:54:37.0790310"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_time",
+      "value": "10:54:37.0790310"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/17.json b/src/driver/src/test/java/shared/testdefs/v2_state/17.json
new file mode 100644
index 0000000..448e9fe
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/17.json
@@ -0,0 +1,88 @@
+{
+  "name": "Global of type range<std::int32>",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global SKNLBIXUQVGVOLT -> range<std::int32>",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type range<std::int32>",
+      "cardinality": 109,
+      "value": "select global SKNLBIXUQVGVOLT",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "SKNLBIXUQVGVOLT": {
+            "type": "range",
+            "value": {
+              "lower": 1118691298,
+              "upper": 1787036958,
+              "inc_lower": true,
+              "inc_upper": false
+            },
+            "element_type": "std::int32"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": 1118691298,
+        "upper": 1787036958,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::int32"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/18.json b/src/driver/src/test/java/shared/testdefs/v2_state/18.json
new file mode 100644
index 0000000..73938a0
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/18.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type cal::relative_duration",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global BEBWRGPQUYBONGA -> cal::relative_duration",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type cal::relative_duration",
+      "cardinality": 109,
+      "value": "select global BEBWRGPQUYBONGA",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "BEBWRGPQUYBONGA": {
+            "type": "cal::relative_duration",
+            "value": "72.00:00:00"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::relative_duration",
+      "value": "72.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/19.json b/src/driver/src/test/java/shared/testdefs/v2_state/19.json
new file mode 100644
index 0000000..78002c0
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/19.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::str",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global RYICUXBEYUHKWFD -> std::str",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::str",
+      "cardinality": 109,
+      "value": "select global RYICUXBEYUHKWFD",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "RYICUXBEYUHKWFD": {
+            "type": "std::str",
+            "value": "BSGOOPSZYRZSRQB"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::str",
+      "value": "BSGOOPSZYRZSRQB"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/2.json b/src/driver/src/test/java/shared/testdefs/v2_state/2.json
new file mode 100644
index 0000000..814f965
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/2.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::bool",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global XZGDXEWOUNJZARD -> std::bool",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::bool",
+      "cardinality": 109,
+      "value": "select global XZGDXEWOUNJZARD",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "XZGDXEWOUNJZARD": {
+            "type": "std::bool",
+            "value": true
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bool",
+      "value": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/20.json b/src/driver/src/test/java/shared/testdefs/v2_state/20.json
new file mode 100644
index 0000000..332d86f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/20.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::uuid",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global WKXPYXJEQCQUIIC -> std::uuid",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::uuid",
+      "cardinality": 109,
+      "value": "select global WKXPYXJEQCQUIIC",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "WKXPYXJEQCQUIIC": {
+            "type": "std::uuid",
+            "value": "7fdc78fc-d845-9234-d3c9-e47836efed91"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::uuid",
+      "value": "7fdc78fc-d845-9234-d3c9-e47836efed91"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/21.json b/src/driver/src/test/java/shared/testdefs/v2_state/21.json
new file mode 100644
index 0000000..e8e7a48
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/21.json
@@ -0,0 +1,200 @@
+{
+  "name": "Global of type array<std::bigint>",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global JEBKDFYOLGFHFMM -> array<std::bigint>",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type array<std::bigint>",
+      "cardinality": 109,
+      "value": "select global JEBKDFYOLGFHFMM",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "JEBKDFYOLGFHFMM": {
+            "type": "array",
+            "value": [
+              {
+                "type": "std::bigint",
+                "value": -116862466306207093663055378
+              },
+              {
+                "type": "std::bigint",
+                "value": -20833407794727991
+              },
+              {
+                "type": "std::bigint",
+                "value": -537438060642
+              },
+              {
+                "type": "std::bigint",
+                "value": -2367490733217589091013595299070551
+              },
+              {
+                "type": "std::bigint",
+                "value": -26524179671559584649149673405
+              },
+              {
+                "type": "std::bigint",
+                "value": 1146718530047847690226
+              },
+              {
+                "type": "std::bigint",
+                "value": -2556981384402901747600254554037592
+              },
+              {
+                "type": "std::bigint",
+                "value": -387408484
+              },
+              {
+                "type": "std::bigint",
+                "value": -2065961750829521018453
+              },
+              {
+                "type": "std::bigint",
+                "value": 30216126625
+              },
+              {
+                "type": "std::bigint",
+                "value": -97753524154678
+              },
+              {
+                "type": "std::bigint",
+                "value": -79817337211468160
+              },
+              {
+                "type": "std::bigint",
+                "value": 233884784592477353192530135217473
+              },
+              {
+                "type": "std::bigint",
+                "value": 2210094605755681046222544520051429
+              },
+              {
+                "type": "std::bigint",
+                "value": 2319654721611845381010
+              }
+            ],
+            "element_type": "std::bigint"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::bigint",
+          "value": -116862466306207093663055378
+        },
+        {
+          "type": "std::bigint",
+          "value": -20833407794727991
+        },
+        {
+          "type": "std::bigint",
+          "value": -537438060642
+        },
+        {
+          "type": "std::bigint",
+          "value": -2367490733217589091013595299070551
+        },
+        {
+          "type": "std::bigint",
+          "value": -26524179671559584649149673405
+        },
+        {
+          "type": "std::bigint",
+          "value": 1146718530047847690226
+        },
+        {
+          "type": "std::bigint",
+          "value": -2556981384402901747600254554037592
+        },
+        {
+          "type": "std::bigint",
+          "value": -387408484
+        },
+        {
+          "type": "std::bigint",
+          "value": -2065961750829521018453
+        },
+        {
+          "type": "std::bigint",
+          "value": 30216126625
+        },
+        {
+          "type": "std::bigint",
+          "value": -97753524154678
+        },
+        {
+          "type": "std::bigint",
+          "value": -79817337211468160
+        },
+        {
+          "type": "std::bigint",
+          "value": 233884784592477353192530135217473
+        },
+        {
+          "type": "std::bigint",
+          "value": 2210094605755681046222544520051429
+        },
+        {
+          "type": "std::bigint",
+          "value": 2319654721611845381010
+        }
+      ],
+      "element_type": "std::bigint"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/22.json b/src/driver/src/test/java/shared/testdefs/v2_state/22.json
new file mode 100644
index 0000000..1427040
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/22.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::bigint",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global UFEGSTMHPSVGUGM -> std::bigint",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::bigint",
+      "cardinality": 109,
+      "value": "select global UFEGSTMHPSVGUGM",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "UFEGSTMHPSVGUGM": {
+            "type": "std::bigint",
+            "value": -324295370812
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bigint",
+      "value": -324295370812
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/23.json b/src/driver/src/test/java/shared/testdefs/v2_state/23.json
new file mode 100644
index 0000000..63ade9f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/23.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::bool",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global KPCCNGRLAQYUUFG -> std::bool",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::bool",
+      "cardinality": 109,
+      "value": "select global KPCCNGRLAQYUUFG",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "KPCCNGRLAQYUUFG": {
+            "type": "std::bool",
+            "value": false
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bool",
+      "value": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/24.json b/src/driver/src/test/java/shared/testdefs/v2_state/24.json
new file mode 100644
index 0000000..e715160
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/24.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::bytes",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global RFRIWUDNBHYNUSD -> std::bytes",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::bytes",
+      "cardinality": 109,
+      "value": "select global RFRIWUDNBHYNUSD",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "RFRIWUDNBHYNUSD": {
+            "type": "std::bytes",
+            "value": "R081SDdSRkRFWFNS"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bytes",
+      "value": "R081SDdSRkRFWFNS"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/25.json b/src/driver/src/test/java/shared/testdefs/v2_state/25.json
new file mode 100644
index 0000000..0068374
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/25.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type cal::date_duration",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global MOAPWQHIXLAZVTF -> cal::date_duration",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type cal::date_duration",
+      "cardinality": 109,
+      "value": "select global MOAPWQHIXLAZVTF",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "MOAPWQHIXLAZVTF": {
+            "type": "cal::date_duration",
+            "value": "-17980.00:00:00"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::date_duration",
+      "value": "-17980.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/26.json b/src/driver/src/test/java/shared/testdefs/v2_state/26.json
new file mode 100644
index 0000000..19c6fa0
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/26.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::datetime",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global KGMXLCSDDXSCUAN -> std::datetime",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::datetime",
+      "cardinality": 109,
+      "value": "select global KGMXLCSDDXSCUAN",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "KGMXLCSDDXSCUAN": {
+            "type": "std::datetime",
+            "value": "4761-10-08T15:11:55.440224-03:00"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::datetime",
+      "value": "4761-10-08T15:11:55.440224-03:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/27.json b/src/driver/src/test/java/shared/testdefs/v2_state/27.json
new file mode 100644
index 0000000..426ddd9
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/27.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::decimal",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global XYBJAAOXSNCLFHI -> std::decimal",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::decimal",
+      "cardinality": 109,
+      "value": "select global XYBJAAOXSNCLFHI",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "XYBJAAOXSNCLFHI": {
+            "type": "std::decimal",
+            "value": 52.934133038825419
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::decimal",
+      "value": 52.934133038825419
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/28.json b/src/driver/src/test/java/shared/testdefs/v2_state/28.json
new file mode 100644
index 0000000..e186a0a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/28.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::duration",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global HAYBMHMTSPFDKMI -> std::duration",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::duration",
+      "cardinality": 109,
+      "value": "select global HAYBMHMTSPFDKMI",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "HAYBMHMTSPFDKMI": {
+            "type": "std::duration",
+            "value": "188.00:00:00"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::duration",
+      "value": "188.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/29.json b/src/driver/src/test/java/shared/testdefs/v2_state/29.json
new file mode 100644
index 0000000..654eae5
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/29.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::float32",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global HAGMJOJEARSKUKG -> std::float32",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::float32",
+      "cardinality": 109,
+      "value": "select global HAGMJOJEARSKUKG",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "HAGMJOJEARSKUKG": {
+            "type": "std::float32",
+            "value": -0.021248966
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float32",
+      "value": -0.021248966
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/3.json b/src/driver/src/test/java/shared/testdefs/v2_state/3.json
new file mode 100644
index 0000000..4345675
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/3.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::bytes",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global CWSXQGGMFXMQIJG -> std::bytes",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::bytes",
+      "cardinality": 109,
+      "value": "select global CWSXQGGMFXMQIJG",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "CWSXQGGMFXMQIJG": {
+            "type": "std::bytes",
+            "value": "UlVKTEkzRVdVWE0="
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bytes",
+      "value": "UlVKTEkzRVdVWE0="
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/30.json b/src/driver/src/test/java/shared/testdefs/v2_state/30.json
new file mode 100644
index 0000000..39e4eeb
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/30.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::float64",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global LQOPHLITIBTLMAU -> std::float64",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::float64",
+      "cardinality": 109,
+      "value": "select global LQOPHLITIBTLMAU",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "LQOPHLITIBTLMAU": {
+            "type": "std::float64",
+            "value": -15.414593642304927
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float64",
+      "value": -15.414593642304927
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/31.json b/src/driver/src/test/java/shared/testdefs/v2_state/31.json
new file mode 100644
index 0000000..9548a37
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/31.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::int16",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global BOONDDMCAELSDFS -> std::int16",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::int16",
+      "cardinality": 109,
+      "value": "select global BOONDDMCAELSDFS",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "BOONDDMCAELSDFS": {
+            "type": "std::int16",
+            "value": 2751
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int16",
+      "value": 2751
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/32.json b/src/driver/src/test/java/shared/testdefs/v2_state/32.json
new file mode 100644
index 0000000..4762aea
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/32.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::int32",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global WWTLYABUBCGFFKA -> std::int32",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::int32",
+      "cardinality": 109,
+      "value": "select global WWTLYABUBCGFFKA",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "WWTLYABUBCGFFKA": {
+            "type": "std::int32",
+            "value": 195537772
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int32",
+      "value": 195537772
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/33.json b/src/driver/src/test/java/shared/testdefs/v2_state/33.json
new file mode 100644
index 0000000..942b3d4
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/33.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::int64",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global IMHNCNHGXBEWBJU -> std::int64",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::int64",
+      "cardinality": 109,
+      "value": "select global IMHNCNHGXBEWBJU",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "IMHNCNHGXBEWBJU": {
+            "type": "std::int64",
+            "value": 1798849795031973693
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int64",
+      "value": 1798849795031973693
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/34.json b/src/driver/src/test/java/shared/testdefs/v2_state/34.json
new file mode 100644
index 0000000..c91d12a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/34.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::json",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global XJHCNNTBAFWUUKK -> std::json",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::json",
+      "cardinality": 109,
+      "value": "select global XJHCNNTBAFWUUKK",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "XJHCNNTBAFWUUKK": {
+            "type": "std::json",
+            "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::json",
+      "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/35.json b/src/driver/src/test/java/shared/testdefs/v2_state/35.json
new file mode 100644
index 0000000..20ebd04
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/35.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type cal::local_datetime",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global QTGOJQXRUESXGEW -> cal::local_datetime",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type cal::local_datetime",
+      "cardinality": 109,
+      "value": "select global QTGOJQXRUESXGEW",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "QTGOJQXRUESXGEW": {
+            "type": "cal::local_datetime",
+            "value": "6040-12-16T08:48:40.5992160"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_datetime",
+      "value": "6040-12-16T08:48:40.5992160"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/36.json b/src/driver/src/test/java/shared/testdefs/v2_state/36.json
new file mode 100644
index 0000000..b5be57b
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/36.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type cal::local_date",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global CZGCOVTFNWRMMMQ -> cal::local_date",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type cal::local_date",
+      "cardinality": 109,
+      "value": "select global CZGCOVTFNWRMMMQ",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "CZGCOVTFNWRMMMQ": {
+            "type": "cal::local_date",
+            "value": "4319-02-12"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_date",
+      "value": "4319-02-12"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/37.json b/src/driver/src/test/java/shared/testdefs/v2_state/37.json
new file mode 100644
index 0000000..50a196c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/37.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type cal::local_time",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global LPOPOSKLTJAETAZ -> cal::local_time",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type cal::local_time",
+      "cardinality": 109,
+      "value": "select global LPOPOSKLTJAETAZ",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "LPOPOSKLTJAETAZ": {
+            "type": "cal::local_time",
+            "value": "10:03:21.6104380"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_time",
+      "value": "10:03:21.6104380"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/38.json b/src/driver/src/test/java/shared/testdefs/v2_state/38.json
new file mode 100644
index 0000000..75708b8
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/38.json
@@ -0,0 +1,88 @@
+{
+  "name": "Global of type range<std::int32>",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global LJYCYMIVUFEIRCI -> range<std::int32>",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type range<std::int32>",
+      "cardinality": 109,
+      "value": "select global LJYCYMIVUFEIRCI",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "LJYCYMIVUFEIRCI": {
+            "type": "range",
+            "value": {
+              "lower": 787432977,
+              "upper": 1121527388,
+              "inc_lower": true,
+              "inc_upper": false
+            },
+            "element_type": "std::int32"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": 787432977,
+        "upper": 1121527388,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::int32"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/39.json b/src/driver/src/test/java/shared/testdefs/v2_state/39.json
new file mode 100644
index 0000000..6990b54
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/39.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type cal::relative_duration",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global HXROHWQVLTBTVSC -> cal::relative_duration",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type cal::relative_duration",
+      "cardinality": 109,
+      "value": "select global HXROHWQVLTBTVSC",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "HXROHWQVLTBTVSC": {
+            "type": "cal::relative_duration",
+            "value": "42.00:00:00"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::relative_duration",
+      "value": "42.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/4.json b/src/driver/src/test/java/shared/testdefs/v2_state/4.json
new file mode 100644
index 0000000..581166f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/4.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type cal::date_duration",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global ZZEUCEBCTCVQOGV -> cal::date_duration",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type cal::date_duration",
+      "cardinality": 109,
+      "value": "select global ZZEUCEBCTCVQOGV",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "ZZEUCEBCTCVQOGV": {
+            "type": "cal::date_duration",
+            "value": "-32616.00:00:00"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::date_duration",
+      "value": "-32616.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/40.json b/src/driver/src/test/java/shared/testdefs/v2_state/40.json
new file mode 100644
index 0000000..18fcb5d
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/40.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::str",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global IGSMWUDNHGMTHBY -> std::str",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::str",
+      "cardinality": 109,
+      "value": "select global IGSMWUDNHGMTHBY",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "IGSMWUDNHGMTHBY": {
+            "type": "std::str",
+            "value": "DFFXJRBGSXEGKRX"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::str",
+      "value": "DFFXJRBGSXEGKRX"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/41.json b/src/driver/src/test/java/shared/testdefs/v2_state/41.json
new file mode 100644
index 0000000..6066065
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/41.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::uuid",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global VELOZQCJBSPCFHY -> std::uuid",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::uuid",
+      "cardinality": 109,
+      "value": "select global VELOZQCJBSPCFHY",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "VELOZQCJBSPCFHY": {
+            "type": "std::uuid",
+            "value": "24c61991-4b88-dd40-e740-d6a681279fe7"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::uuid",
+      "value": "24c61991-4b88-dd40-e740-d6a681279fe7"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/42.json b/src/driver/src/test/java/shared/testdefs/v2_state/42.json
new file mode 100644
index 0000000..75be4bc
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/42.json
@@ -0,0 +1,192 @@
+{
+  "name": "Global of type array<std::bigint>",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global WHBFIHDJVXMLNJO -> array<std::bigint>",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type array<std::bigint>",
+      "cardinality": 109,
+      "value": "select global WHBFIHDJVXMLNJO",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "WHBFIHDJVXMLNJO": {
+            "type": "array",
+            "value": [
+              {
+                "type": "std::bigint",
+                "value": 1424137723660084106376115178944934
+              },
+              {
+                "type": "std::bigint",
+                "value": -8518996711956500158
+              },
+              {
+                "type": "std::bigint",
+                "value": 15764920502282065337785882549
+              },
+              {
+                "type": "std::bigint",
+                "value": -12899503408465910
+              },
+              {
+                "type": "std::bigint",
+                "value": 45714945283002
+              },
+              {
+                "type": "std::bigint",
+                "value": -261513316089584102462209993
+              },
+              {
+                "type": "std::bigint",
+                "value": -31422028203501128838767157175
+              },
+              {
+                "type": "std::bigint",
+                "value": 85855741008226458769030078
+              },
+              {
+                "type": "std::bigint",
+                "value": 23319035974205721922888977410
+              },
+              {
+                "type": "std::bigint",
+                "value": 2237077389830676228622
+              },
+              {
+                "type": "std::bigint",
+                "value": 85230978900736053234382697
+              },
+              {
+                "type": "std::bigint",
+                "value": -4220251441251024740
+              },
+              {
+                "type": "std::bigint",
+                "value": -65770424248375985771890527
+              },
+              {
+                "type": "std::bigint",
+                "value": -196789124
+              }
+            ],
+            "element_type": "std::bigint"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::bigint",
+          "value": 1424137723660084106376115178944934
+        },
+        {
+          "type": "std::bigint",
+          "value": -8518996711956500158
+        },
+        {
+          "type": "std::bigint",
+          "value": 15764920502282065337785882549
+        },
+        {
+          "type": "std::bigint",
+          "value": -12899503408465910
+        },
+        {
+          "type": "std::bigint",
+          "value": 45714945283002
+        },
+        {
+          "type": "std::bigint",
+          "value": -261513316089584102462209993
+        },
+        {
+          "type": "std::bigint",
+          "value": -31422028203501128838767157175
+        },
+        {
+          "type": "std::bigint",
+          "value": 85855741008226458769030078
+        },
+        {
+          "type": "std::bigint",
+          "value": 23319035974205721922888977410
+        },
+        {
+          "type": "std::bigint",
+          "value": 2237077389830676228622
+        },
+        {
+          "type": "std::bigint",
+          "value": 85230978900736053234382697
+        },
+        {
+          "type": "std::bigint",
+          "value": -4220251441251024740
+        },
+        {
+          "type": "std::bigint",
+          "value": -65770424248375985771890527
+        },
+        {
+          "type": "std::bigint",
+          "value": -196789124
+        }
+      ],
+      "element_type": "std::bigint"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/43.json b/src/driver/src/test/java/shared/testdefs/v2_state/43.json
new file mode 100644
index 0000000..555e5d5
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/43.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::bigint",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global WJSIEBKNZVPAGMN -> std::bigint",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::bigint",
+      "cardinality": 109,
+      "value": "select global WJSIEBKNZVPAGMN",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "WJSIEBKNZVPAGMN": {
+            "type": "std::bigint",
+            "value": 4871574272576369332790119876766
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bigint",
+      "value": 4871574272576369332790119876766
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/44.json b/src/driver/src/test/java/shared/testdefs/v2_state/44.json
new file mode 100644
index 0000000..0c17cb1
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/44.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::bool",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global EGENIQNALUYCBKQ -> std::bool",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::bool",
+      "cardinality": 109,
+      "value": "select global EGENIQNALUYCBKQ",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "EGENIQNALUYCBKQ": {
+            "type": "std::bool",
+            "value": true
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bool",
+      "value": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/45.json b/src/driver/src/test/java/shared/testdefs/v2_state/45.json
new file mode 100644
index 0000000..a23ba83
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/45.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::bytes",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global EANTEISHLKYKYBZ -> std::bytes",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::bytes",
+      "cardinality": 109,
+      "value": "select global EANTEISHLKYKYBZ",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "EANTEISHLKYKYBZ": {
+            "type": "std::bytes",
+            "value": "S0JFMkZHU1JRSkxIQUdDVkRXWg=="
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bytes",
+      "value": "S0JFMkZHU1JRSkxIQUdDVkRXWg=="
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/46.json b/src/driver/src/test/java/shared/testdefs/v2_state/46.json
new file mode 100644
index 0000000..44c837a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/46.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type cal::date_duration",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global NZTRBBIIZHSJZLS -> cal::date_duration",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type cal::date_duration",
+      "cardinality": 109,
+      "value": "select global NZTRBBIIZHSJZLS",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "NZTRBBIIZHSJZLS": {
+            "type": "cal::date_duration",
+            "value": "13960.00:00:00"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::date_duration",
+      "value": "13960.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/47.json b/src/driver/src/test/java/shared/testdefs/v2_state/47.json
new file mode 100644
index 0000000..7a65e93
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/47.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::datetime",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global GNJPVLFABIXGYFQ -> std::datetime",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::datetime",
+      "cardinality": 109,
+      "value": "select global GNJPVLFABIXGYFQ",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "GNJPVLFABIXGYFQ": {
+            "type": "std::datetime",
+            "value": "3861-01-26T10:58:52.06308-04:00"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::datetime",
+      "value": "3861-01-26T10:58:52.06308-04:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/48.json b/src/driver/src/test/java/shared/testdefs/v2_state/48.json
new file mode 100644
index 0000000..d9e632c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/48.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::decimal",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global SNMYLLVILPCKNSO -> std::decimal",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::decimal",
+      "cardinality": 109,
+      "value": "select global SNMYLLVILPCKNSO",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "SNMYLLVILPCKNSO": {
+            "type": "std::decimal",
+            "value": 15.499551679705968
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::decimal",
+      "value": 15.499551679705968
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/49.json b/src/driver/src/test/java/shared/testdefs/v2_state/49.json
new file mode 100644
index 0000000..a8d4e8e
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/49.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::duration",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global XBRRNNRASLBBBBE -> std::duration",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::duration",
+      "cardinality": 109,
+      "value": "select global XBRRNNRASLBBBBE",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "XBRRNNRASLBBBBE": {
+            "type": "std::duration",
+            "value": "126.00:00:00"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::duration",
+      "value": "126.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/5.json b/src/driver/src/test/java/shared/testdefs/v2_state/5.json
new file mode 100644
index 0000000..e3a1f83
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/5.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::datetime",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global XULIULQZPCQZWOD -> std::datetime",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::datetime",
+      "cardinality": 109,
+      "value": "select global XULIULQZPCQZWOD",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "XULIULQZPCQZWOD": {
+            "type": "std::datetime",
+            "value": "8595-12-11T17:15:33.592928-04:00"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::datetime",
+      "value": "8595-12-11T17:15:33.592928-04:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/50.json b/src/driver/src/test/java/shared/testdefs/v2_state/50.json
new file mode 100644
index 0000000..5d322bc
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/50.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::float32",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global HHBYTMAQYQVESSM -> std::float32",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::float32",
+      "cardinality": 109,
+      "value": "select global HHBYTMAQYQVESSM",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "HHBYTMAQYQVESSM": {
+            "type": "std::float32",
+            "value": 4.7441278
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float32",
+      "value": 4.7441278
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/51.json b/src/driver/src/test/java/shared/testdefs/v2_state/51.json
new file mode 100644
index 0000000..a0f5bdc
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/51.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::float64",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global FAVYTZUHJNYGFSR -> std::float64",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::float64",
+      "cardinality": 109,
+      "value": "select global FAVYTZUHJNYGFSR",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "FAVYTZUHJNYGFSR": {
+            "type": "std::float64",
+            "value": -9.5455151729032
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float64",
+      "value": -9.5455151729032
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/52.json b/src/driver/src/test/java/shared/testdefs/v2_state/52.json
new file mode 100644
index 0000000..5498a87
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/52.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::int16",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global WCXFMWSKXGJIPIA -> std::int16",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::int16",
+      "cardinality": 109,
+      "value": "select global WCXFMWSKXGJIPIA",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "WCXFMWSKXGJIPIA": {
+            "type": "std::int16",
+            "value": 31060
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int16",
+      "value": 31060
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/53.json b/src/driver/src/test/java/shared/testdefs/v2_state/53.json
new file mode 100644
index 0000000..3c01874
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/53.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::int32",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global UWMJIYZEQDZJQMA -> std::int32",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::int32",
+      "cardinality": 109,
+      "value": "select global UWMJIYZEQDZJQMA",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "UWMJIYZEQDZJQMA": {
+            "type": "std::int32",
+            "value": 2083995326
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int32",
+      "value": 2083995326
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/54.json b/src/driver/src/test/java/shared/testdefs/v2_state/54.json
new file mode 100644
index 0000000..d6581c4
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/54.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::int64",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global HFSDCOVTLZUFXHH -> std::int64",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::int64",
+      "cardinality": 109,
+      "value": "select global HFSDCOVTLZUFXHH",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "HFSDCOVTLZUFXHH": {
+            "type": "std::int64",
+            "value": 8111713682516886103
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int64",
+      "value": 8111713682516886103
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/55.json b/src/driver/src/test/java/shared/testdefs/v2_state/55.json
new file mode 100644
index 0000000..375c2ea
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/55.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::json",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global VMBNEXAVTTAGTIO -> std::json",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::json",
+      "cardinality": 109,
+      "value": "select global VMBNEXAVTTAGTIO",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "VMBNEXAVTTAGTIO": {
+            "type": "std::json",
+            "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::json",
+      "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/56.json b/src/driver/src/test/java/shared/testdefs/v2_state/56.json
new file mode 100644
index 0000000..c403502
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/56.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type cal::local_datetime",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global ARRBTJVMEOFWXCB -> cal::local_datetime",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type cal::local_datetime",
+      "cardinality": 109,
+      "value": "select global ARRBTJVMEOFWXCB",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "ARRBTJVMEOFWXCB": {
+            "type": "cal::local_datetime",
+            "value": "5060-08-03T03:52:45.5697120"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_datetime",
+      "value": "5060-08-03T03:52:45.5697120"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/57.json b/src/driver/src/test/java/shared/testdefs/v2_state/57.json
new file mode 100644
index 0000000..a81d96f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/57.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type cal::local_date",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global FHAJWJFWKJNPZCK -> cal::local_date",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type cal::local_date",
+      "cardinality": 109,
+      "value": "select global FHAJWJFWKJNPZCK",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "FHAJWJFWKJNPZCK": {
+            "type": "cal::local_date",
+            "value": "3278-06-26"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_date",
+      "value": "3278-06-26"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/58.json b/src/driver/src/test/java/shared/testdefs/v2_state/58.json
new file mode 100644
index 0000000..bbd07e5
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/58.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type cal::local_time",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global XPQVCDGBZJUZVQZ -> cal::local_time",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type cal::local_time",
+      "cardinality": 109,
+      "value": "select global XPQVCDGBZJUZVQZ",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "XPQVCDGBZJUZVQZ": {
+            "type": "cal::local_time",
+            "value": "12:02:08.0087030"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_time",
+      "value": "12:02:08.0087030"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/59.json b/src/driver/src/test/java/shared/testdefs/v2_state/59.json
new file mode 100644
index 0000000..03a262a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/59.json
@@ -0,0 +1,88 @@
+{
+  "name": "Global of type range<std::int32>",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global XELVPDEMRSDDUHW -> range<std::int32>",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type range<std::int32>",
+      "cardinality": 109,
+      "value": "select global XELVPDEMRSDDUHW",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "XELVPDEMRSDDUHW": {
+            "type": "range",
+            "value": {
+              "lower": 1998888868,
+              "upper": 2085957933,
+              "inc_lower": true,
+              "inc_upper": false
+            },
+            "element_type": "std::int32"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": 1998888868,
+        "upper": 2085957933,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::int32"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/6.json b/src/driver/src/test/java/shared/testdefs/v2_state/6.json
new file mode 100644
index 0000000..3f161c7
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/6.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::decimal",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global JWIUNVONEQOIGUL -> std::decimal",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::decimal",
+      "cardinality": 109,
+      "value": "select global JWIUNVONEQOIGUL",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "JWIUNVONEQOIGUL": {
+            "type": "std::decimal",
+            "value": 0.10986763290589075
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::decimal",
+      "value": 0.10986763290589075
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/60.json b/src/driver/src/test/java/shared/testdefs/v2_state/60.json
new file mode 100644
index 0000000..dfecccf
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/60.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type cal::relative_duration",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global XOTOQVZCURTHFQT -> cal::relative_duration",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type cal::relative_duration",
+      "cardinality": 109,
+      "value": "select global XOTOQVZCURTHFQT",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "XOTOQVZCURTHFQT": {
+            "type": "cal::relative_duration",
+            "value": "98.00:00:00"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::relative_duration",
+      "value": "98.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/61.json b/src/driver/src/test/java/shared/testdefs/v2_state/61.json
new file mode 100644
index 0000000..8fa0986
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/61.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::str",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global JAIUGTGJLTUMLFM -> std::str",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::str",
+      "cardinality": 109,
+      "value": "select global JAIUGTGJLTUMLFM",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "JAIUGTGJLTUMLFM": {
+            "type": "std::str",
+            "value": "YDUYZJRMMGLZESU"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::str",
+      "value": "YDUYZJRMMGLZESU"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/62.json b/src/driver/src/test/java/shared/testdefs/v2_state/62.json
new file mode 100644
index 0000000..8823321
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/62.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::uuid",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global WLYEIYXEXLMFOFA -> std::uuid",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::uuid",
+      "cardinality": 109,
+      "value": "select global WLYEIYXEXLMFOFA",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "WLYEIYXEXLMFOFA": {
+            "type": "std::uuid",
+            "value": "478fb13a-cde7-2b5c-5819-fc4ef0924bf7"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::uuid",
+      "value": "478fb13a-cde7-2b5c-5819-fc4ef0924bf7"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/7.json b/src/driver/src/test/java/shared/testdefs/v2_state/7.json
new file mode 100644
index 0000000..76e1e91
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/7.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::duration",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global EDRFNNUMCLDWOSQ -> std::duration",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::duration",
+      "cardinality": 109,
+      "value": "select global EDRFNNUMCLDWOSQ",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "EDRFNNUMCLDWOSQ": {
+            "type": "std::duration",
+            "value": "460.00:00:00"
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::duration",
+      "value": "460.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/8.json b/src/driver/src/test/java/shared/testdefs/v2_state/8.json
new file mode 100644
index 0000000..eb53b46
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/8.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::float32",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global DDHQUGGALHVVNYF -> std::float32",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::float32",
+      "cardinality": 109,
+      "value": "select global DDHQUGGALHVVNYF",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "DDHQUGGALHVVNYF": {
+            "type": "std::float32",
+            "value": 0.86851543
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float32",
+      "value": 0.86851543
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v2_state/9.json b/src/driver/src/test/java/shared/testdefs/v2_state/9.json
new file mode 100644
index 0000000..8537bf4
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v2_state/9.json
@@ -0,0 +1,76 @@
+{
+  "name": "Global of type std::float64",
+  "queries": [
+    {
+      "name": "Start transaction",
+      "cardinality": 110,
+      "value": "start transaction",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Create global",
+      "cardinality": 110,
+      "value": "create global VJOHKKKRPYXHRIM -> std::float64",
+      "arguments": [],
+      "capabilities": 8,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    },
+    {
+      "name": "Select global of type std::float64",
+      "cardinality": 109,
+      "value": "select global VJOHKKKRPYXHRIM",
+      "arguments": [],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {
+          "VJOHKKKRPYXHRIM": {
+            "type": "std::float64",
+            "value": 80.35789921197943
+          }
+        }
+      }
+    },
+    {
+      "name": "Rollback",
+      "cardinality": 110,
+      "value": "rollback",
+      "arguments": [],
+      "capabilities": 4,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {
+          "ddl_policy": 0
+        },
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float64",
+      "value": 80.35789921197943
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments.json b/src/driver/src/test/java/shared/testdefs/v3_arguments.json
new file mode 100644
index 0000000..aaaabae
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments.json
@@ -0,0 +1,4 @@
+{
+  "protocol_version": "1.0",
+  "name": "V3 Arguments"
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/0.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/0.json
new file mode 100644
index 0000000..9d07493
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/0.json
@@ -0,0 +1,156 @@
+{
+  "name": "Argument of type array<std::bigint>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <array<std::bigint>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "array<std::bigint>",
+          "value": {
+            "type": "array",
+            "value": [
+              {
+                "type": "std::bigint",
+                "value": 1683471060357585966953401719466952
+              },
+              {
+                "type": "std::bigint",
+                "value": 1078594995
+              },
+              {
+                "type": "std::bigint",
+                "value": 4978808705160117705035637
+              },
+              {
+                "type": "std::bigint",
+                "value": -21032931613428405
+              },
+              {
+                "type": "std::bigint",
+                "value": 18685293397537
+              },
+              {
+                "type": "std::bigint",
+                "value": -82964411835772
+              },
+              {
+                "type": "std::bigint",
+                "value": 2016575164419795661550157035622
+              },
+              {
+                "type": "std::bigint",
+                "value": -2196457375204816284485
+              },
+              {
+                "type": "std::bigint",
+                "value": 1004899331322766491501
+              },
+              {
+                "type": "std::bigint",
+                "value": 478414862298742379683662
+              },
+              {
+                "type": "std::bigint",
+                "value": -1890903747444990898922095670397045
+              },
+              {
+                "type": "std::bigint",
+                "value": -4810849241313362122
+              },
+              {
+                "type": "std::bigint",
+                "value": 406762244173595159973148
+              },
+              {
+                "type": "std::bigint",
+                "value": -72470202616
+              },
+              {
+                "type": "std::bigint",
+                "value": -680306557
+              }
+            ],
+            "element_type": "std::bigint"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::bigint",
+          "value": 1683471060357585966953401719466952
+        },
+        {
+          "type": "std::bigint",
+          "value": 1078594995
+        },
+        {
+          "type": "std::bigint",
+          "value": 4978808705160117705035637
+        },
+        {
+          "type": "std::bigint",
+          "value": -21032931613428405
+        },
+        {
+          "type": "std::bigint",
+          "value": 18685293397537
+        },
+        {
+          "type": "std::bigint",
+          "value": -82964411835772
+        },
+        {
+          "type": "std::bigint",
+          "value": 2016575164419795661550157035622
+        },
+        {
+          "type": "std::bigint",
+          "value": -2196457375204816284485
+        },
+        {
+          "type": "std::bigint",
+          "value": 1004899331322766491501
+        },
+        {
+          "type": "std::bigint",
+          "value": 478414862298742379683662
+        },
+        {
+          "type": "std::bigint",
+          "value": -1890903747444990898922095670397045
+        },
+        {
+          "type": "std::bigint",
+          "value": -4810849241313362122
+        },
+        {
+          "type": "std::bigint",
+          "value": 406762244173595159973148
+        },
+        {
+          "type": "std::bigint",
+          "value": -72470202616
+        },
+        {
+          "type": "std::bigint",
+          "value": -680306557
+        }
+      ],
+      "element_type": "std::bigint"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/1.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/1.json
new file mode 100644
index 0000000..185da76
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/1.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bigint",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bigint>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bigint",
+          "value": {
+            "type": "std::bigint",
+            "value": 817110136258735961472
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bigint",
+      "value": 817110136258735961472
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/10.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/10.json
new file mode 100644
index 0000000..2706a19
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/10.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int16",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int16>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int16",
+          "value": {
+            "type": "std::int16",
+            "value": 13776
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int16",
+      "value": 13776
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/11.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/11.json
new file mode 100644
index 0000000..377d554
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/11.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int32>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int32",
+          "value": {
+            "type": "std::int32",
+            "value": 2093652717
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int32",
+      "value": 2093652717
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/12.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/12.json
new file mode 100644
index 0000000..6ebb65f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/12.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int64>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int64",
+          "value": {
+            "type": "std::int64",
+            "value": 2353570371465927195
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int64",
+      "value": 2353570371465927195
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/13.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/13.json
new file mode 100644
index 0000000..21bf0ec
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/13.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::json",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::json>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::json",
+          "value": {
+            "type": "std::json",
+            "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::json",
+      "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/14.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/14.json
new file mode 100644
index 0000000..3f0682e
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/14.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_datetime>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_datetime",
+          "value": {
+            "type": "cal::local_datetime",
+            "value": "1323-07-08T12:47:24.1641960"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_datetime",
+      "value": "1323-07-08T12:47:24.1641960"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/15.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/15.json
new file mode 100644
index 0000000..bed3525
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/15.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_date",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_date>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_date",
+          "value": {
+            "type": "cal::local_date",
+            "value": "8972-08-19"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_date",
+      "value": "8972-08-19"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/16.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/16.json
new file mode 100644
index 0000000..91e1239
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/16.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_time",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_time>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_time",
+          "value": {
+            "type": "cal::local_time",
+            "value": "01:38:09.3240860"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_time",
+      "value": "01:38:09.3240860"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/17.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/17.json
new file mode 100644
index 0000000..7376154
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/17.json
@@ -0,0 +1,44 @@
+{
+  "name": "Argument of type range<std::int32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <range<std::int32>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "range<std::int32>",
+          "value": {
+            "type": "range",
+            "value": {
+              "lower": 1895996110,
+              "upper": 2129760585,
+              "inc_lower": true,
+              "inc_upper": false
+            },
+            "element_type": "std::int32"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": 1895996110,
+        "upper": 2129760585,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::int32"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/18.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/18.json
new file mode 100644
index 0000000..785661f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/18.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::relative_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::relative_duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::relative_duration",
+          "value": {
+            "type": "cal::relative_duration",
+            "value": "3.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::relative_duration",
+      "value": "3.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/19.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/19.json
new file mode 100644
index 0000000..8cc1895
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/19.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::str",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::str>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::str",
+          "value": {
+            "type": "std::str",
+            "value": "DFMPGIGUDPORIAC"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::str",
+      "value": "DFMPGIGUDPORIAC"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/2.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/2.json
new file mode 100644
index 0000000..38d3469
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/2.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bool",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bool>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bool",
+          "value": {
+            "type": "std::bool",
+            "value": true
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bool",
+      "value": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/20.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/20.json
new file mode 100644
index 0000000..7d3826a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/20.json
@@ -0,0 +1,186 @@
+{
+  "name": "Argument of type tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>",
+          "value": {
+            "type": "tuple",
+            "value": [
+              {
+                "type": "std::bigint",
+                "value": 1021085557402431377250564946283
+              },
+              {
+                "type": "std::bool",
+                "value": false
+              },
+              {
+                "type": "std::bytes",
+                "value": "QTA5RjJER0NEMUQ1WFVJNQ=="
+              },
+              {
+                "type": "cal::date_duration",
+                "value": "28165.00:00:00"
+              },
+              {
+                "type": "std::datetime",
+                "value": "9071-06-09T08:50:26.377248-03:00"
+              },
+              {
+                "type": "std::decimal",
+                "value": 36.945744326778574
+              },
+              {
+                "type": "std::duration",
+                "value": "170.00:00:00"
+              },
+              {
+                "type": "std::float32",
+                "value": 32.681686
+              },
+              {
+                "type": "std::float64",
+                "value": -59.940355634289034
+              },
+              {
+                "type": "std::int16",
+                "value": 20441
+              },
+              {
+                "type": "std::int32",
+                "value": 2127406736
+              },
+              {
+                "type": "std::int64",
+                "value": 1269500871310045429
+              },
+              {
+                "type": "std::json",
+                "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+              },
+              {
+                "type": "cal::local_datetime",
+                "value": "0020-12-22T11:50:25.6154480"
+              },
+              {
+                "type": "cal::local_date",
+                "value": "5575-02-05"
+              },
+              {
+                "type": "cal::local_time",
+                "value": "20:19:28.1631880"
+              },
+              {
+                "type": "cal::relative_duration",
+                "value": "37.00:00:00"
+              },
+              {
+                "type": "std::str",
+                "value": "IUNVONEQOIGULXI"
+              },
+              {
+                "type": "std::uuid",
+                "value": "6793f909-04e6-a306-ef42-38de7a6ceca2"
+              }
+            ]
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "tuple",
+      "value": [
+        {
+          "type": "std::bigint",
+          "value": 1021085557402431377250564946283
+        },
+        {
+          "type": "std::bool",
+          "value": false
+        },
+        {
+          "type": "std::bytes",
+          "value": "QTA5RjJER0NEMUQ1WFVJNQ=="
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "28165.00:00:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "9071-06-09T08:50:26.377248-03:00"
+        },
+        {
+          "type": "std::decimal",
+          "value": 36.945744326778574
+        },
+        {
+          "type": "std::duration",
+          "value": "170.00:00:00"
+        },
+        {
+          "type": "std::float32",
+          "value": 32.681686
+        },
+        {
+          "type": "std::float64",
+          "value": -59.940355634289034
+        },
+        {
+          "type": "std::int16",
+          "value": 20441
+        },
+        {
+          "type": "std::int32",
+          "value": 2127406736
+        },
+        {
+          "type": "std::int64",
+          "value": 1269500871310045429
+        },
+        {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        },
+        {
+          "type": "cal::local_datetime",
+          "value": "0020-12-22T11:50:25.6154480"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "5575-02-05"
+        },
+        {
+          "type": "cal::local_time",
+          "value": "20:19:28.1631880"
+        },
+        {
+          "type": "cal::relative_duration",
+          "value": "37.00:00:00"
+        },
+        {
+          "type": "std::str",
+          "value": "IUNVONEQOIGULXI"
+        },
+        {
+          "type": "std::uuid",
+          "value": "6793f909-04e6-a306-ef42-38de7a6ceca2"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/21.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/21.json
new file mode 100644
index 0000000..27da38a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/21.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::uuid",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::uuid>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::uuid",
+          "value": {
+            "type": "std::uuid",
+            "value": "11923fde-cc50-8b8d-6329-672c626e0022"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::uuid",
+      "value": "11923fde-cc50-8b8d-6329-672c626e0022"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/22.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/22.json
new file mode 100644
index 0000000..f577b29
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/22.json
@@ -0,0 +1,188 @@
+{
+  "name": "Argument of type array<std::bigint>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <array<std::bigint>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "array<std::bigint>",
+          "value": {
+            "type": "array",
+            "value": [
+              {
+                "type": "std::bigint",
+                "value": 596881571015562273669391
+              },
+              {
+                "type": "std::bigint",
+                "value": 852582091812315
+              },
+              {
+                "type": "std::bigint",
+                "value": 23371068856989
+              },
+              {
+                "type": "std::bigint",
+                "value": -3463331848539408640004187091283
+              },
+              {
+                "type": "std::bigint",
+                "value": 61211924510252649936595101
+              },
+              {
+                "type": "std::bigint",
+                "value": 1397785853814082021956
+              },
+              {
+                "type": "std::bigint",
+                "value": -478750245595
+              },
+              {
+                "type": "std::bigint",
+                "value": -127338296888712
+              },
+              {
+                "type": "std::bigint",
+                "value": -1325994745044908879
+              },
+              {
+                "type": "std::bigint",
+                "value": 524780101953706892598
+              },
+              {
+                "type": "std::bigint",
+                "value": 8830099280886632714849774461413
+              },
+              {
+                "type": "std::bigint",
+                "value": -292855519598003044315180763070294
+              },
+              {
+                "type": "std::bigint",
+                "value": 2384376342880060027862418810885
+              },
+              {
+                "type": "std::bigint",
+                "value": 31488343488470536352484730622
+              },
+              {
+                "type": "std::bigint",
+                "value": -16406817858068828120556
+              },
+              {
+                "type": "std::bigint",
+                "value": -356367563969219467210675
+              },
+              {
+                "type": "std::bigint",
+                "value": -82343677300221307100199870
+              },
+              {
+                "type": "std::bigint",
+                "value": -403902453281704010607862
+              },
+              {
+                "type": "std::bigint",
+                "value": -2226878259169131492189369944952608
+              }
+            ],
+            "element_type": "std::bigint"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::bigint",
+          "value": 596881571015562273669391
+        },
+        {
+          "type": "std::bigint",
+          "value": 852582091812315
+        },
+        {
+          "type": "std::bigint",
+          "value": 23371068856989
+        },
+        {
+          "type": "std::bigint",
+          "value": -3463331848539408640004187091283
+        },
+        {
+          "type": "std::bigint",
+          "value": 61211924510252649936595101
+        },
+        {
+          "type": "std::bigint",
+          "value": 1397785853814082021956
+        },
+        {
+          "type": "std::bigint",
+          "value": -478750245595
+        },
+        {
+          "type": "std::bigint",
+          "value": -127338296888712
+        },
+        {
+          "type": "std::bigint",
+          "value": -1325994745044908879
+        },
+        {
+          "type": "std::bigint",
+          "value": 524780101953706892598
+        },
+        {
+          "type": "std::bigint",
+          "value": 8830099280886632714849774461413
+        },
+        {
+          "type": "std::bigint",
+          "value": -292855519598003044315180763070294
+        },
+        {
+          "type": "std::bigint",
+          "value": 2384376342880060027862418810885
+        },
+        {
+          "type": "std::bigint",
+          "value": 31488343488470536352484730622
+        },
+        {
+          "type": "std::bigint",
+          "value": -16406817858068828120556
+        },
+        {
+          "type": "std::bigint",
+          "value": -356367563969219467210675
+        },
+        {
+          "type": "std::bigint",
+          "value": -82343677300221307100199870
+        },
+        {
+          "type": "std::bigint",
+          "value": -403902453281704010607862
+        },
+        {
+          "type": "std::bigint",
+          "value": -2226878259169131492189369944952608
+        }
+      ],
+      "element_type": "std::bigint"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/23.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/23.json
new file mode 100644
index 0000000..c8cf797
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/23.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bigint",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bigint>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bigint",
+          "value": {
+            "type": "std::bigint",
+            "value": -7092626326464961335
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bigint",
+      "value": -7092626326464961335
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/24.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/24.json
new file mode 100644
index 0000000..5041e09
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/24.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bool",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bool>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bool",
+          "value": {
+            "type": "std::bool",
+            "value": false
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bool",
+      "value": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/25.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/25.json
new file mode 100644
index 0000000..210ef62
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/25.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bytes",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bytes>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bytes",
+          "value": {
+            "type": "std::bytes",
+            "value": "N1Y4N05HWERXM0xMRFk="
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bytes",
+      "value": "N1Y4N05HWERXM0xMRFk="
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/26.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/26.json
new file mode 100644
index 0000000..9043183
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/26.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::date_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::date_duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::date_duration",
+          "value": {
+            "type": "cal::date_duration",
+            "value": "18594.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::date_duration",
+      "value": "18594.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/27.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/27.json
new file mode 100644
index 0000000..6b3766b
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/27.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::datetime>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::datetime",
+          "value": {
+            "type": "std::datetime",
+            "value": "4834-11-15T03:29:51.143008-04:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::datetime",
+      "value": "4834-11-15T03:29:51.143008-04:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/28.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/28.json
new file mode 100644
index 0000000..cbd1e58
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/28.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::decimal",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::decimal>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::decimal",
+          "value": {
+            "type": "std::decimal",
+            "value": 0.11310150572708876
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::decimal",
+      "value": 0.11310150572708876
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/29.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/29.json
new file mode 100644
index 0000000..6700c80
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/29.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::duration",
+          "value": {
+            "type": "std::duration",
+            "value": "167.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::duration",
+      "value": "167.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/3.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/3.json
new file mode 100644
index 0000000..97c70e8
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/3.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bytes",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bytes>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bytes",
+          "value": {
+            "type": "std::bytes",
+            "value": "Q1FSSENJRlFRQU40SA=="
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bytes",
+      "value": "Q1FSSENJRlFRQU40SA=="
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/30.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/30.json
new file mode 100644
index 0000000..191454f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/30.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::float32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::float32>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::float32",
+          "value": {
+            "type": "std::float32",
+            "value": 7.889852
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float32",
+      "value": 7.889852
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/31.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/31.json
new file mode 100644
index 0000000..3d6ba7c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/31.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::float64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::float64>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::float64",
+          "value": {
+            "type": "std::float64",
+            "value": 55.862803455378305
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float64",
+      "value": 55.862803455378305
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/32.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/32.json
new file mode 100644
index 0000000..b87a42c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/32.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int16",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int16>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int16",
+          "value": {
+            "type": "std::int16",
+            "value": 31033
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int16",
+      "value": 31033
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/33.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/33.json
new file mode 100644
index 0000000..cf0e4d4
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/33.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int32>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int32",
+          "value": {
+            "type": "std::int32",
+            "value": 226392897
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int32",
+      "value": 226392897
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/34.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/34.json
new file mode 100644
index 0000000..ab8912f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/34.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int64>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int64",
+          "value": {
+            "type": "std::int64",
+            "value": 7585390158638061779
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int64",
+      "value": 7585390158638061779
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/35.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/35.json
new file mode 100644
index 0000000..21bf0ec
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/35.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::json",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::json>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::json",
+          "value": {
+            "type": "std::json",
+            "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::json",
+      "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/36.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/36.json
new file mode 100644
index 0000000..33181a3
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/36.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_datetime>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_datetime",
+          "value": {
+            "type": "cal::local_datetime",
+            "value": "1374-01-01T23:17:10.6660400"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_datetime",
+      "value": "1374-01-01T23:17:10.6660400"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/37.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/37.json
new file mode 100644
index 0000000..8270344
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/37.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_date",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_date>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_date",
+          "value": {
+            "type": "cal::local_date",
+            "value": "5279-01-22"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_date",
+      "value": "5279-01-22"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/38.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/38.json
new file mode 100644
index 0000000..bc7ca15
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/38.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_time",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_time>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_time",
+          "value": {
+            "type": "cal::local_time",
+            "value": "16:46:41.5998120"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_time",
+      "value": "16:46:41.5998120"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/39.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/39.json
new file mode 100644
index 0000000..945b5f8
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/39.json
@@ -0,0 +1,44 @@
+{
+  "name": "Argument of type range<std::int32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <range<std::int32>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "range<std::int32>",
+          "value": {
+            "type": "range",
+            "value": {
+              "lower": 730775401,
+              "upper": 1108234069,
+              "inc_lower": true,
+              "inc_upper": false
+            },
+            "element_type": "std::int32"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": 730775401,
+        "upper": 1108234069,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::int32"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/4.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/4.json
new file mode 100644
index 0000000..3d5d0d4
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/4.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::date_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::date_duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::date_duration",
+          "value": {
+            "type": "cal::date_duration",
+            "value": "-29936.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::date_duration",
+      "value": "-29936.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/40.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/40.json
new file mode 100644
index 0000000..1e57510
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/40.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::relative_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::relative_duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::relative_duration",
+          "value": {
+            "type": "cal::relative_duration",
+            "value": "62.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::relative_duration",
+      "value": "62.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/41.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/41.json
new file mode 100644
index 0000000..a0cf145
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/41.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::str",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::str>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::str",
+          "value": {
+            "type": "std::str",
+            "value": "HIBKNGDDZGKVKYA"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::str",
+      "value": "HIBKNGDDZGKVKYA"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/42.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/42.json
new file mode 100644
index 0000000..691d731
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/42.json
@@ -0,0 +1,484 @@
+{
+  "name": "Argument of type tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>, std::uuid>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>, std::uuid>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>, std::uuid>",
+          "value": {
+            "type": "tuple",
+            "value": [
+              {
+                "type": "array",
+                "value": [
+                  {
+                    "type": "std::bigint",
+                    "value": -120702806503805242961699
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -43446067775844041598773824
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -197027610054967665497445
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 2038504369440953798499
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 107388290525341
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -23767038959972842
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 118031744
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -97753524154678
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -79817337211468160
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 233884784592477353192530135217473
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 2210094605755681046222544520051429
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 2319654721611845381010
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 1489885144512753246608604824085
+                  }
+                ],
+                "element_type": "std::bigint"
+              },
+              {
+                "type": "std::bigint",
+                "value": -78275800146611251964
+              },
+              {
+                "type": "std::bool",
+                "value": true
+              },
+              {
+                "type": "std::bytes",
+                "value": "SVoyUktWWjRKM0o="
+              },
+              {
+                "type": "cal::date_duration",
+                "value": "-16271.00:00:00"
+              },
+              {
+                "type": "std::datetime",
+                "value": "2458-08-17T17:11:10.003578-03:00"
+              },
+              {
+                "type": "std::decimal",
+                "value": 23.244686381539656
+              },
+              {
+                "type": "std::duration",
+                "value": "43.00:00:00"
+              },
+              {
+                "type": "std::float32",
+                "value": 5.169956
+              },
+              {
+                "type": "std::float64",
+                "value": 29.989626622753974
+              },
+              {
+                "type": "std::int16",
+                "value": 20364
+              },
+              {
+                "type": "std::int32",
+                "value": 1989073385
+              },
+              {
+                "type": "std::int64",
+                "value": 2062365184249939847
+              },
+              {
+                "type": "std::json",
+                "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+              },
+              {
+                "type": "cal::local_datetime",
+                "value": "2403-07-12T23:35:04.5056720"
+              },
+              {
+                "type": "cal::local_date",
+                "value": "2434-11-27"
+              },
+              {
+                "type": "cal::local_time",
+                "value": "17:26:33.7986410"
+              },
+              {
+                "type": "range",
+                "value": {
+                  "lower": 853776262,
+                  "upper": 1830650315,
+                  "inc_lower": true,
+                  "inc_upper": false
+                },
+                "element_type": "std::int32"
+              },
+              {
+                "type": "cal::relative_duration",
+                "value": "21.00:00:00"
+              },
+              {
+                "type": "std::str",
+                "value": "MECDRNMZRFRIWUD"
+              },
+              {
+                "type": "tuple",
+                "value": [
+                  {
+                    "type": "std::bigint",
+                    "value": -75926221052919109109
+                  },
+                  {
+                    "type": "std::bool",
+                    "value": true
+                  },
+                  {
+                    "type": "std::bytes",
+                    "value": "VUFXNlhLTTdQQTk1MUg="
+                  },
+                  {
+                    "type": "cal::date_duration",
+                    "value": "-15601.00:00:00"
+                  },
+                  {
+                    "type": "std::datetime",
+                    "value": "3926-02-28T12:32:35.699736-04:00"
+                  },
+                  {
+                    "type": "std::decimal",
+                    "value": 12.436462490091312
+                  },
+                  {
+                    "type": "std::duration",
+                    "value": "449.00:00:00"
+                  },
+                  {
+                    "type": "std::float32",
+                    "value": 3.4538164
+                  },
+                  {
+                    "type": "std::float64",
+                    "value": -1.3194221427288941
+                  },
+                  {
+                    "type": "std::int16",
+                    "value": 23366
+                  },
+                  {
+                    "type": "std::int32",
+                    "value": 245901592
+                  },
+                  {
+                    "type": "std::int64",
+                    "value": 4964664567559420171
+                  },
+                  {
+                    "type": "std::json",
+                    "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+                  },
+                  {
+                    "type": "cal::local_datetime",
+                    "value": "6377-12-20T00:15:06.5129760"
+                  },
+                  {
+                    "type": "cal::local_date",
+                    "value": "8374-08-25"
+                  },
+                  {
+                    "type": "cal::local_time",
+                    "value": "22:10:23.2544980"
+                  },
+                  {
+                    "type": "cal::relative_duration",
+                    "value": "90.00:00:00"
+                  },
+                  {
+                    "type": "std::str",
+                    "value": "BJAAOXSNCLFHIJT"
+                  },
+                  {
+                    "type": "std::uuid",
+                    "value": "7503fa89-0bc8-181c-25b9-72c20c9cbb6b"
+                  }
+                ]
+              },
+              {
+                "type": "std::uuid",
+                "value": "f78c8e28-c17d-ed4d-d480-7bf99fe3e971"
+              }
+            ]
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "tuple",
+      "value": [
+        {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::bigint",
+              "value": -120702806503805242961699
+            },
+            {
+              "type": "std::bigint",
+              "value": -43446067775844041598773824
+            },
+            {
+              "type": "std::bigint",
+              "value": -197027610054967665497445
+            },
+            {
+              "type": "std::bigint",
+              "value": 2038504369440953798499
+            },
+            {
+              "type": "std::bigint",
+              "value": 107388290525341
+            },
+            {
+              "type": "std::bigint",
+              "value": -23767038959972842
+            },
+            {
+              "type": "std::bigint",
+              "value": 118031744
+            },
+            {
+              "type": "std::bigint",
+              "value": -97753524154678
+            },
+            {
+              "type": "std::bigint",
+              "value": -79817337211468160
+            },
+            {
+              "type": "std::bigint",
+              "value": 233884784592477353192530135217473
+            },
+            {
+              "type": "std::bigint",
+              "value": 2210094605755681046222544520051429
+            },
+            {
+              "type": "std::bigint",
+              "value": 2319654721611845381010
+            },
+            {
+              "type": "std::bigint",
+              "value": 1489885144512753246608604824085
+            }
+          ],
+          "element_type": "std::bigint"
+        },
+        {
+          "type": "std::bigint",
+          "value": -78275800146611251964
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bytes",
+          "value": "SVoyUktWWjRKM0o="
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "-16271.00:00:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "2458-08-17T17:11:10.003578-03:00"
+        },
+        {
+          "type": "std::decimal",
+          "value": 23.244686381539656
+        },
+        {
+          "type": "std::duration",
+          "value": "43.00:00:00"
+        },
+        {
+          "type": "std::float32",
+          "value": 5.169956
+        },
+        {
+          "type": "std::float64",
+          "value": 29.989626622753974
+        },
+        {
+          "type": "std::int16",
+          "value": 20364
+        },
+        {
+          "type": "std::int32",
+          "value": 1989073385
+        },
+        {
+          "type": "std::int64",
+          "value": 2062365184249939847
+        },
+        {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        },
+        {
+          "type": "cal::local_datetime",
+          "value": "2403-07-12T23:35:04.5056720"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "2434-11-27"
+        },
+        {
+          "type": "cal::local_time",
+          "value": "17:26:33.7986410"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 853776262,
+            "upper": 1830650315,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "cal::relative_duration",
+          "value": "21.00:00:00"
+        },
+        {
+          "type": "std::str",
+          "value": "MECDRNMZRFRIWUD"
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "std::bigint",
+              "value": -75926221052919109109
+            },
+            {
+              "type": "std::bool",
+              "value": true
+            },
+            {
+              "type": "std::bytes",
+              "value": "VUFXNlhLTTdQQTk1MUg="
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-15601.00:00:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "3926-02-28T12:32:35.699736-04:00"
+            },
+            {
+              "type": "std::decimal",
+              "value": 12.436462490091312
+            },
+            {
+              "type": "std::duration",
+              "value": "449.00:00:00"
+            },
+            {
+              "type": "std::float32",
+              "value": 3.4538164
+            },
+            {
+              "type": "std::float64",
+              "value": -1.3194221427288941
+            },
+            {
+              "type": "std::int16",
+              "value": 23366
+            },
+            {
+              "type": "std::int32",
+              "value": 245901592
+            },
+            {
+              "type": "std::int64",
+              "value": 4964664567559420171
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "6377-12-20T00:15:06.5129760"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "8374-08-25"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "22:10:23.2544980"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "90.00:00:00"
+            },
+            {
+              "type": "std::str",
+              "value": "BJAAOXSNCLFHIJT"
+            },
+            {
+              "type": "std::uuid",
+              "value": "7503fa89-0bc8-181c-25b9-72c20c9cbb6b"
+            }
+          ]
+        },
+        {
+          "type": "std::uuid",
+          "value": "f78c8e28-c17d-ed4d-d480-7bf99fe3e971"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/43.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/43.json
new file mode 100644
index 0000000..c05de13
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/43.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::uuid",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::uuid>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::uuid",
+          "value": {
+            "type": "std::uuid",
+            "value": "05828174-6bfe-fcc1-f37b-72fa7d6ccdda"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::uuid",
+      "value": "05828174-6bfe-fcc1-f37b-72fa7d6ccdda"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/44.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/44.json
new file mode 100644
index 0000000..f6f9135
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/44.json
@@ -0,0 +1,164 @@
+{
+  "name": "Argument of type array<std::bigint>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <array<std::bigint>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "array<std::bigint>",
+          "value": {
+            "type": "array",
+            "value": [
+              {
+                "type": "std::bigint",
+                "value": -2152720392899178295224
+              },
+              {
+                "type": "std::bigint",
+                "value": 3916150107317
+              },
+              {
+                "type": "std::bigint",
+                "value": -3574554412318698674
+              },
+              {
+                "type": "std::bigint",
+                "value": 98658629605509
+              },
+              {
+                "type": "std::bigint",
+                "value": 11874737666685387
+              },
+              {
+                "type": "std::bigint",
+                "value": -7102843274308427486268724657633
+              },
+              {
+                "type": "std::bigint",
+                "value": -38573947965316789928730824811
+              },
+              {
+                "type": "std::bigint",
+                "value": 44113578894163
+              },
+              {
+                "type": "std::bigint",
+                "value": 448922742856
+              },
+              {
+                "type": "std::bigint",
+                "value": -7907758816019362066
+              },
+              {
+                "type": "std::bigint",
+                "value": -47420543659907
+              },
+              {
+                "type": "std::bigint",
+                "value": 58457006378397828902969207
+              },
+              {
+                "type": "std::bigint",
+                "value": -2712273903739394832
+              },
+              {
+                "type": "std::bigint",
+                "value": 2496524019061038793
+              },
+              {
+                "type": "std::bigint",
+                "value": -138564685903597
+              },
+              {
+                "type": "std::bigint",
+                "value": 34585717505251868804869978759
+              }
+            ],
+            "element_type": "std::bigint"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::bigint",
+          "value": -2152720392899178295224
+        },
+        {
+          "type": "std::bigint",
+          "value": 3916150107317
+        },
+        {
+          "type": "std::bigint",
+          "value": -3574554412318698674
+        },
+        {
+          "type": "std::bigint",
+          "value": 98658629605509
+        },
+        {
+          "type": "std::bigint",
+          "value": 11874737666685387
+        },
+        {
+          "type": "std::bigint",
+          "value": -7102843274308427486268724657633
+        },
+        {
+          "type": "std::bigint",
+          "value": -38573947965316789928730824811
+        },
+        {
+          "type": "std::bigint",
+          "value": 44113578894163
+        },
+        {
+          "type": "std::bigint",
+          "value": 448922742856
+        },
+        {
+          "type": "std::bigint",
+          "value": -7907758816019362066
+        },
+        {
+          "type": "std::bigint",
+          "value": -47420543659907
+        },
+        {
+          "type": "std::bigint",
+          "value": 58457006378397828902969207
+        },
+        {
+          "type": "std::bigint",
+          "value": -2712273903739394832
+        },
+        {
+          "type": "std::bigint",
+          "value": 2496524019061038793
+        },
+        {
+          "type": "std::bigint",
+          "value": -138564685903597
+        },
+        {
+          "type": "std::bigint",
+          "value": 34585717505251868804869978759
+        }
+      ],
+      "element_type": "std::bigint"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/45.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/45.json
new file mode 100644
index 0000000..0829fe7
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/45.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bigint",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bigint>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bigint",
+          "value": {
+            "type": "std::bigint",
+            "value": -9526929368770645835672517936619
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bigint",
+      "value": -9526929368770645835672517936619
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/46.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/46.json
new file mode 100644
index 0000000..5041e09
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/46.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bool",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bool>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bool",
+          "value": {
+            "type": "std::bool",
+            "value": false
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bool",
+      "value": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/47.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/47.json
new file mode 100644
index 0000000..576ac4e
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/47.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bytes",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bytes>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bytes",
+          "value": {
+            "type": "std::bytes",
+            "value": "UFk4NkxKWlI1M0ZT"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bytes",
+      "value": "UFk4NkxKWlI1M0ZT"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/48.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/48.json
new file mode 100644
index 0000000..6fc39e5
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/48.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::date_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::date_duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::date_duration",
+          "value": {
+            "type": "cal::date_duration",
+            "value": "9855.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::date_duration",
+      "value": "9855.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/49.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/49.json
new file mode 100644
index 0000000..ea4b9fd
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/49.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::datetime>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::datetime",
+          "value": {
+            "type": "std::datetime",
+            "value": "4746-01-23T12:31:35.443808-04:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::datetime",
+      "value": "4746-01-23T12:31:35.443808-04:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/5.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/5.json
new file mode 100644
index 0000000..984086d
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/5.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::datetime>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::datetime",
+          "value": {
+            "type": "std::datetime",
+            "value": "5095-02-07T08:16:22.290064-04:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::datetime",
+      "value": "5095-02-07T08:16:22.290064-04:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/50.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/50.json
new file mode 100644
index 0000000..1055029
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/50.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::decimal",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::decimal>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::decimal",
+          "value": {
+            "type": "std::decimal",
+            "value": 21.971576484372647
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::decimal",
+      "value": 21.971576484372647
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/51.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/51.json
new file mode 100644
index 0000000..51a3b58
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/51.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::duration",
+          "value": {
+            "type": "std::duration",
+            "value": "35.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::duration",
+      "value": "35.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/52.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/52.json
new file mode 100644
index 0000000..77078e0
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/52.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::float32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::float32>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::float32",
+          "value": {
+            "type": "std::float32",
+            "value": 49.97451
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float32",
+      "value": 49.97451
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/53.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/53.json
new file mode 100644
index 0000000..10871f4
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/53.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::float64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::float64>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::float64",
+          "value": {
+            "type": "std::float64",
+            "value": -19.25470090715899
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float64",
+      "value": -19.25470090715899
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/54.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/54.json
new file mode 100644
index 0000000..10daa44
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/54.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int16",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int16>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int16",
+          "value": {
+            "type": "std::int16",
+            "value": 3915
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int16",
+      "value": 3915
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/55.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/55.json
new file mode 100644
index 0000000..5a779cb
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/55.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int32>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int32",
+          "value": {
+            "type": "std::int32",
+            "value": 1116924736
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int32",
+      "value": 1116924736
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/56.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/56.json
new file mode 100644
index 0000000..6ce682e
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/56.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int64>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int64",
+          "value": {
+            "type": "std::int64",
+            "value": 7800371776127324292
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int64",
+      "value": 7800371776127324292
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/57.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/57.json
new file mode 100644
index 0000000..21bf0ec
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/57.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::json",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::json>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::json",
+          "value": {
+            "type": "std::json",
+            "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::json",
+      "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/58.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/58.json
new file mode 100644
index 0000000..5aaf29a
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/58.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_datetime>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_datetime",
+          "value": {
+            "type": "cal::local_datetime",
+            "value": "4214-01-07T12:56:35.0678800"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_datetime",
+      "value": "4214-01-07T12:56:35.0678800"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/59.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/59.json
new file mode 100644
index 0000000..b79db5e
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/59.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_date",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_date>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_date",
+          "value": {
+            "type": "cal::local_date",
+            "value": "8235-02-02"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_date",
+      "value": "8235-02-02"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/6.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/6.json
new file mode 100644
index 0000000..af66d37
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/6.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::decimal",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::decimal>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::decimal",
+          "value": {
+            "type": "std::decimal",
+            "value": 95.3260737714945
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::decimal",
+      "value": 95.3260737714945
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/60.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/60.json
new file mode 100644
index 0000000..05f8546
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/60.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_time",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_time>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_time",
+          "value": {
+            "type": "cal::local_time",
+            "value": "14:49:03.4243590"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_time",
+      "value": "14:49:03.4243590"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/61.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/61.json
new file mode 100644
index 0000000..f4242ef
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/61.json
@@ -0,0 +1,44 @@
+{
+  "name": "Argument of type range<std::int32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <range<std::int32>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "range<std::int32>",
+          "value": {
+            "type": "range",
+            "value": {
+              "lower": 1452948519,
+              "upper": 1673793017,
+              "inc_lower": true,
+              "inc_upper": false
+            },
+            "element_type": "std::int32"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": 1452948519,
+        "upper": 1673793017,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::int32"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/62.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/62.json
new file mode 100644
index 0000000..d66f3f1
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/62.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::relative_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::relative_duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::relative_duration",
+          "value": {
+            "type": "cal::relative_duration",
+            "value": "82.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::relative_duration",
+      "value": "82.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/63.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/63.json
new file mode 100644
index 0000000..3c52d7f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/63.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::str",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::str>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::str",
+          "value": {
+            "type": "std::str",
+            "value": "LOZQCJBSPCFHYQY"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::str",
+      "value": "LOZQCJBSPCFHYQY"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/64.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/64.json
new file mode 100644
index 0000000..e32e5c6
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/64.json
@@ -0,0 +1,726 @@
+{
+  "name": "Argument of type tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>, std::uuid>, std::uuid>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>, std::uuid>, std::uuid>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>, std::uuid>, std::uuid>",
+          "value": {
+            "type": "tuple",
+            "value": [
+              {
+                "type": "array",
+                "value": [
+                  {
+                    "type": "std::bigint",
+                    "value": 414410595285
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 1424137723660084106376115178944934
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -8518996711956500158
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 15764920502282065337785882549
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -12899503408465910
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 45714945283002
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -261513316089584102462209993
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -31422028203501128838767157175
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 85855741008226458769030078
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 23319035974205721922888977410
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 2237077389830676228622
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 85230978900736053234382697
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -4220251441251024740
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -65770424248375985771890527
+                  }
+                ],
+                "element_type": "std::bigint"
+              },
+              {
+                "type": "std::bigint",
+                "value": -196789124
+              },
+              {
+                "type": "std::bool",
+                "value": true
+              },
+              {
+                "type": "std::bytes",
+                "value": "TENITEpFTTQ3UlFTTVU3OUpG"
+              },
+              {
+                "type": "cal::date_duration",
+                "value": "-26125.00:00:00"
+              },
+              {
+                "type": "std::datetime",
+                "value": "4156-01-23T23:58:26.174928-04:00"
+              },
+              {
+                "type": "std::decimal",
+                "value": 6.403052215652100
+              },
+              {
+                "type": "std::duration",
+                "value": "54.00:00:00"
+              },
+              {
+                "type": "std::float32",
+                "value": -24.388285
+              },
+              {
+                "type": "std::float64",
+                "value": 19.914676063654326
+              },
+              {
+                "type": "std::int16",
+                "value": 12172
+              },
+              {
+                "type": "std::int32",
+                "value": 1492027032
+              },
+              {
+                "type": "std::int64",
+                "value": 527714300895890313
+              },
+              {
+                "type": "std::json",
+                "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+              },
+              {
+                "type": "cal::local_datetime",
+                "value": "4048-01-26T07:34:40.4414720"
+              },
+              {
+                "type": "cal::local_date",
+                "value": "5110-09-26"
+              },
+              {
+                "type": "cal::local_time",
+                "value": "05:52:16.1569380"
+              },
+              {
+                "type": "range",
+                "value": {
+                  "lower": 1796857196,
+                  "upper": 2037725060,
+                  "inc_lower": true,
+                  "inc_upper": false
+                },
+                "element_type": "std::int32"
+              },
+              {
+                "type": "cal::relative_duration",
+                "value": "9.00:00:00"
+              },
+              {
+                "type": "std::str",
+                "value": "KQZHACTEENMLHHF"
+              },
+              {
+                "type": "tuple",
+                "value": [
+                  {
+                    "type": "array",
+                    "value": [
+                      {
+                        "type": "std::bigint",
+                        "value": -68836073192856
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": -47639116540101584085113495
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": 834891570928646066185
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": -4876278104182761294810166
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": 577160427664634406136
+                      }
+                    ],
+                    "element_type": "std::bigint"
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -69694546645398
+                  },
+                  {
+                    "type": "std::bool",
+                    "value": false
+                  },
+                  {
+                    "type": "std::bytes",
+                    "value": "NU1QVURQU1pVSlo3Qlg="
+                  },
+                  {
+                    "type": "cal::date_duration",
+                    "value": "-22443.00:00:00"
+                  },
+                  {
+                    "type": "std::datetime",
+                    "value": "5100-08-24T20:04:41.681696-03:00"
+                  },
+                  {
+                    "type": "std::decimal",
+                    "value": 1.311781145311790
+                  },
+                  {
+                    "type": "std::duration",
+                    "value": "362.00:00:00"
+                  },
+                  {
+                    "type": "std::float32",
+                    "value": 2.1549687
+                  },
+                  {
+                    "type": "std::float64",
+                    "value": -0.3795742338428154
+                  },
+                  {
+                    "type": "std::int16",
+                    "value": 5014
+                  },
+                  {
+                    "type": "std::int32",
+                    "value": 675014727
+                  },
+                  {
+                    "type": "std::int64",
+                    "value": 2809057589128584260
+                  },
+                  {
+                    "type": "std::json",
+                    "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+                  },
+                  {
+                    "type": "cal::local_datetime",
+                    "value": "2951-08-25T15:09:30.0847480"
+                  },
+                  {
+                    "type": "cal::local_date",
+                    "value": "0566-11-14"
+                  },
+                  {
+                    "type": "cal::local_time",
+                    "value": "12:08:54.6885000"
+                  },
+                  {
+                    "type": "range",
+                    "value": {
+                      "lower": 1631588101,
+                      "upper": 1998534792,
+                      "inc_lower": true,
+                      "inc_upper": false
+                    },
+                    "element_type": "std::int32"
+                  },
+                  {
+                    "type": "cal::relative_duration",
+                    "value": "62.00:00:00"
+                  },
+                  {
+                    "type": "std::str",
+                    "value": "ESSMTDELFAVYTZU"
+                  },
+                  {
+                    "type": "tuple",
+                    "value": [
+                      {
+                        "type": "std::bigint",
+                        "value": 7810880384449448
+                      },
+                      {
+                        "type": "std::bool",
+                        "value": true
+                      },
+                      {
+                        "type": "std::bytes",
+                        "value": "NUU3SFI2MU83SU1NVUw="
+                      },
+                      {
+                        "type": "cal::date_duration",
+                        "value": "999.00:00:00"
+                      },
+                      {
+                        "type": "std::datetime",
+                        "value": "8870-08-23T23:29:11.727552-03:00"
+                      },
+                      {
+                        "type": "std::decimal",
+                        "value": 68.462898440408919
+                      },
+                      {
+                        "type": "std::duration",
+                        "value": "232.00:00:00"
+                      },
+                      {
+                        "type": "std::float32",
+                        "value": -11.42923
+                      },
+                      {
+                        "type": "std::float64",
+                        "value": 17.627751826135327
+                      },
+                      {
+                        "type": "std::int16",
+                        "value": 3910
+                      },
+                      {
+                        "type": "std::int32",
+                        "value": 2131025109
+                      },
+                      {
+                        "type": "std::int64",
+                        "value": 4483031154742237547
+                      },
+                      {
+                        "type": "std::json",
+                        "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+                      },
+                      {
+                        "type": "cal::local_datetime",
+                        "value": "0208-08-18T22:40:07.2868640"
+                      },
+                      {
+                        "type": "cal::local_date",
+                        "value": "7581-03-22"
+                      },
+                      {
+                        "type": "cal::local_time",
+                        "value": "04:34:40.6809260"
+                      },
+                      {
+                        "type": "cal::relative_duration",
+                        "value": "87.00:00:00"
+                      },
+                      {
+                        "type": "std::str",
+                        "value": "HFSDCOVTLZUFXHH"
+                      },
+                      {
+                        "type": "std::uuid",
+                        "value": "9d530591-2719-0a13-6568-88cba154751c"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "std::uuid",
+                    "value": "0fb2dc53-1b28-fbd7-c0cf-ec0e1dae3cd9"
+                  }
+                ]
+              },
+              {
+                "type": "std::uuid",
+                "value": "0bb9fc9c-cf12-dc48-9b3a-acd5cd8f9c85"
+              }
+            ]
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "tuple",
+      "value": [
+        {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::bigint",
+              "value": 414410595285
+            },
+            {
+              "type": "std::bigint",
+              "value": 1424137723660084106376115178944934
+            },
+            {
+              "type": "std::bigint",
+              "value": -8518996711956500158
+            },
+            {
+              "type": "std::bigint",
+              "value": 15764920502282065337785882549
+            },
+            {
+              "type": "std::bigint",
+              "value": -12899503408465910
+            },
+            {
+              "type": "std::bigint",
+              "value": 45714945283002
+            },
+            {
+              "type": "std::bigint",
+              "value": -261513316089584102462209993
+            },
+            {
+              "type": "std::bigint",
+              "value": -31422028203501128838767157175
+            },
+            {
+              "type": "std::bigint",
+              "value": 85855741008226458769030078
+            },
+            {
+              "type": "std::bigint",
+              "value": 23319035974205721922888977410
+            },
+            {
+              "type": "std::bigint",
+              "value": 2237077389830676228622
+            },
+            {
+              "type": "std::bigint",
+              "value": 85230978900736053234382697
+            },
+            {
+              "type": "std::bigint",
+              "value": -4220251441251024740
+            },
+            {
+              "type": "std::bigint",
+              "value": -65770424248375985771890527
+            }
+          ],
+          "element_type": "std::bigint"
+        },
+        {
+          "type": "std::bigint",
+          "value": -196789124
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bytes",
+          "value": "TENITEpFTTQ3UlFTTVU3OUpG"
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "-26125.00:00:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "4156-01-23T23:58:26.174928-04:00"
+        },
+        {
+          "type": "std::decimal",
+          "value": 6.403052215652100
+        },
+        {
+          "type": "std::duration",
+          "value": "54.00:00:00"
+        },
+        {
+          "type": "std::float32",
+          "value": -24.388285
+        },
+        {
+          "type": "std::float64",
+          "value": 19.914676063654326
+        },
+        {
+          "type": "std::int16",
+          "value": 12172
+        },
+        {
+          "type": "std::int32",
+          "value": 1492027032
+        },
+        {
+          "type": "std::int64",
+          "value": 527714300895890313
+        },
+        {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        },
+        {
+          "type": "cal::local_datetime",
+          "value": "4048-01-26T07:34:40.4414720"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "5110-09-26"
+        },
+        {
+          "type": "cal::local_time",
+          "value": "05:52:16.1569380"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 1796857196,
+            "upper": 2037725060,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "cal::relative_duration",
+          "value": "9.00:00:00"
+        },
+        {
+          "type": "std::str",
+          "value": "KQZHACTEENMLHHF"
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "array",
+              "value": [
+                {
+                  "type": "std::bigint",
+                  "value": -68836073192856
+                },
+                {
+                  "type": "std::bigint",
+                  "value": -47639116540101584085113495
+                },
+                {
+                  "type": "std::bigint",
+                  "value": 834891570928646066185
+                },
+                {
+                  "type": "std::bigint",
+                  "value": -4876278104182761294810166
+                },
+                {
+                  "type": "std::bigint",
+                  "value": 577160427664634406136
+                }
+              ],
+              "element_type": "std::bigint"
+            },
+            {
+              "type": "std::bigint",
+              "value": -69694546645398
+            },
+            {
+              "type": "std::bool",
+              "value": false
+            },
+            {
+              "type": "std::bytes",
+              "value": "NU1QVURQU1pVSlo3Qlg="
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "-22443.00:00:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "5100-08-24T20:04:41.681696-03:00"
+            },
+            {
+              "type": "std::decimal",
+              "value": 1.311781145311790
+            },
+            {
+              "type": "std::duration",
+              "value": "362.00:00:00"
+            },
+            {
+              "type": "std::float32",
+              "value": 2.1549687
+            },
+            {
+              "type": "std::float64",
+              "value": -0.3795742338428154
+            },
+            {
+              "type": "std::int16",
+              "value": 5014
+            },
+            {
+              "type": "std::int32",
+              "value": 675014727
+            },
+            {
+              "type": "std::int64",
+              "value": 2809057589128584260
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "2951-08-25T15:09:30.0847480"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "0566-11-14"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "12:08:54.6885000"
+            },
+            {
+              "type": "range",
+              "value": {
+                "lower": 1631588101,
+                "upper": 1998534792,
+                "inc_lower": true,
+                "inc_upper": false
+              },
+              "element_type": "std::int32"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "62.00:00:00"
+            },
+            {
+              "type": "std::str",
+              "value": "ESSMTDELFAVYTZU"
+            },
+            {
+              "type": "tuple",
+              "value": [
+                {
+                  "type": "std::bigint",
+                  "value": 7810880384449448
+                },
+                {
+                  "type": "std::bool",
+                  "value": true
+                },
+                {
+                  "type": "std::bytes",
+                  "value": "NUU3SFI2MU83SU1NVUw="
+                },
+                {
+                  "type": "cal::date_duration",
+                  "value": "999.00:00:00"
+                },
+                {
+                  "type": "std::datetime",
+                  "value": "8870-08-23T23:29:11.727552-03:00"
+                },
+                {
+                  "type": "std::decimal",
+                  "value": 68.462898440408919
+                },
+                {
+                  "type": "std::duration",
+                  "value": "232.00:00:00"
+                },
+                {
+                  "type": "std::float32",
+                  "value": -11.42923
+                },
+                {
+                  "type": "std::float64",
+                  "value": 17.627751826135327
+                },
+                {
+                  "type": "std::int16",
+                  "value": 3910
+                },
+                {
+                  "type": "std::int32",
+                  "value": 2131025109
+                },
+                {
+                  "type": "std::int64",
+                  "value": 4483031154742237547
+                },
+                {
+                  "type": "std::json",
+                  "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+                },
+                {
+                  "type": "cal::local_datetime",
+                  "value": "0208-08-18T22:40:07.2868640"
+                },
+                {
+                  "type": "cal::local_date",
+                  "value": "7581-03-22"
+                },
+                {
+                  "type": "cal::local_time",
+                  "value": "04:34:40.6809260"
+                },
+                {
+                  "type": "cal::relative_duration",
+                  "value": "87.00:00:00"
+                },
+                {
+                  "type": "std::str",
+                  "value": "HFSDCOVTLZUFXHH"
+                },
+                {
+                  "type": "std::uuid",
+                  "value": "9d530591-2719-0a13-6568-88cba154751c"
+                }
+              ]
+            },
+            {
+              "type": "std::uuid",
+              "value": "0fb2dc53-1b28-fbd7-c0cf-ec0e1dae3cd9"
+            }
+          ]
+        },
+        {
+          "type": "std::uuid",
+          "value": "0bb9fc9c-cf12-dc48-9b3a-acd5cd8f9c85"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/65.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/65.json
new file mode 100644
index 0000000..15935dc
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/65.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::uuid",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::uuid>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::uuid",
+          "value": {
+            "type": "std::uuid",
+            "value": "a0955243-7f4a-765e-2e58-dc4a3a05ecb6"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::uuid",
+      "value": "a0955243-7f4a-765e-2e58-dc4a3a05ecb6"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/66.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/66.json
new file mode 100644
index 0000000..3530fb3
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/66.json
@@ -0,0 +1,172 @@
+{
+  "name": "Argument of type array<std::bigint>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <array<std::bigint>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "array<std::bigint>",
+          "value": {
+            "type": "array",
+            "value": [
+              {
+                "type": "std::bigint",
+                "value": 7259849359503661
+              },
+              {
+                "type": "std::bigint",
+                "value": -149206262642
+              },
+              {
+                "type": "std::bigint",
+                "value": 333222903538
+              },
+              {
+                "type": "std::bigint",
+                "value": 668501472137533960206067703209
+              },
+              {
+                "type": "std::bigint",
+                "value": 27243228966703378589055167018
+              },
+              {
+                "type": "std::bigint",
+                "value": -2536372255766273369647827749858992
+              },
+              {
+                "type": "std::bigint",
+                "value": 13420048949205788105198606479
+              },
+              {
+                "type": "std::bigint",
+                "value": 2185936722554260487193
+              },
+              {
+                "type": "std::bigint",
+                "value": 1316193837927095127852
+              },
+              {
+                "type": "std::bigint",
+                "value": 33917374103700
+              },
+              {
+                "type": "std::bigint",
+                "value": -594663212278417256986176
+              },
+              {
+                "type": "std::bigint",
+                "value": 905387358463845622216370333417
+              },
+              {
+                "type": "std::bigint",
+                "value": 261804484794456798891028
+              },
+              {
+                "type": "std::bigint",
+                "value": -118264715092792
+              },
+              {
+                "type": "std::bigint",
+                "value": -724225421181134925740603941547689
+              },
+              {
+                "type": "std::bigint",
+                "value": 3761948408565820914
+              },
+              {
+                "type": "std::bigint",
+                "value": 1347703606
+              }
+            ],
+            "element_type": "std::bigint"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "array",
+      "value": [
+        {
+          "type": "std::bigint",
+          "value": 7259849359503661
+        },
+        {
+          "type": "std::bigint",
+          "value": -149206262642
+        },
+        {
+          "type": "std::bigint",
+          "value": 333222903538
+        },
+        {
+          "type": "std::bigint",
+          "value": 668501472137533960206067703209
+        },
+        {
+          "type": "std::bigint",
+          "value": 27243228966703378589055167018
+        },
+        {
+          "type": "std::bigint",
+          "value": -2536372255766273369647827749858992
+        },
+        {
+          "type": "std::bigint",
+          "value": 13420048949205788105198606479
+        },
+        {
+          "type": "std::bigint",
+          "value": 2185936722554260487193
+        },
+        {
+          "type": "std::bigint",
+          "value": 1316193837927095127852
+        },
+        {
+          "type": "std::bigint",
+          "value": 33917374103700
+        },
+        {
+          "type": "std::bigint",
+          "value": -594663212278417256986176
+        },
+        {
+          "type": "std::bigint",
+          "value": 905387358463845622216370333417
+        },
+        {
+          "type": "std::bigint",
+          "value": 261804484794456798891028
+        },
+        {
+          "type": "std::bigint",
+          "value": -118264715092792
+        },
+        {
+          "type": "std::bigint",
+          "value": -724225421181134925740603941547689
+        },
+        {
+          "type": "std::bigint",
+          "value": 3761948408565820914
+        },
+        {
+          "type": "std::bigint",
+          "value": 1347703606
+        }
+      ],
+      "element_type": "std::bigint"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/67.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/67.json
new file mode 100644
index 0000000..fa8d3c4
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/67.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bigint",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bigint>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bigint",
+          "value": {
+            "type": "std::bigint",
+            "value": 15698465850933527198748443705
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bigint",
+      "value": 15698465850933527198748443705
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/68.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/68.json
new file mode 100644
index 0000000..38d3469
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/68.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bool",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bool>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bool",
+          "value": {
+            "type": "std::bool",
+            "value": true
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bool",
+      "value": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/69.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/69.json
new file mode 100644
index 0000000..0a87f7b
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/69.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::bytes",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::bytes>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::bytes",
+          "value": {
+            "type": "std::bytes",
+            "value": "R09JWTA0VzdIWjVIUjVPOQ=="
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::bytes",
+      "value": "R09JWTA0VzdIWjVIUjVPOQ=="
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/7.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/7.json
new file mode 100644
index 0000000..ad96b05
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/7.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::duration",
+          "value": {
+            "type": "std::duration",
+            "value": "8.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::duration",
+      "value": "8.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/70.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/70.json
new file mode 100644
index 0000000..5aaa626
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/70.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::date_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::date_duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::date_duration",
+          "value": {
+            "type": "cal::date_duration",
+            "value": "12883.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::date_duration",
+      "value": "12883.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/71.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/71.json
new file mode 100644
index 0000000..f1c7e92
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/71.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::datetime>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::datetime",
+          "value": {
+            "type": "std::datetime",
+            "value": "1897-02-06T05:06:23.85-04:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::datetime",
+      "value": "1897-02-06T05:06:23.85-04:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/72.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/72.json
new file mode 100644
index 0000000..2cf7895
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/72.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::decimal",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::decimal>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::decimal",
+          "value": {
+            "type": "std::decimal",
+            "value": 11.629229632499271
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::decimal",
+      "value": 11.629229632499271
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/73.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/73.json
new file mode 100644
index 0000000..d23d297
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/73.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::duration",
+          "value": {
+            "type": "std::duration",
+            "value": "343.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::duration",
+      "value": "343.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/74.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/74.json
new file mode 100644
index 0000000..b84297f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/74.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::float32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::float32>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::float32",
+          "value": {
+            "type": "std::float32",
+            "value": 29.074303
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float32",
+      "value": 29.074303
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/75.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/75.json
new file mode 100644
index 0000000..297c815
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/75.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::float64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::float64>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::float64",
+          "value": {
+            "type": "std::float64",
+            "value": 0.13306912134078758
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float64",
+      "value": 0.13306912134078758
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/76.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/76.json
new file mode 100644
index 0000000..005c398
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/76.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int16",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int16>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int16",
+          "value": {
+            "type": "std::int16",
+            "value": 6164
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int16",
+      "value": 6164
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/77.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/77.json
new file mode 100644
index 0000000..02bf91f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/77.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int32>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int32",
+          "value": {
+            "type": "std::int32",
+            "value": 1245887601
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int32",
+      "value": 1245887601
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/78.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/78.json
new file mode 100644
index 0000000..9680005
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/78.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::int64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::int64>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::int64",
+          "value": {
+            "type": "std::int64",
+            "value": 5040320513538749560
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::int64",
+      "value": 5040320513538749560
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/79.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/79.json
new file mode 100644
index 0000000..21bf0ec
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/79.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::json",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::json>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::json",
+          "value": {
+            "type": "std::json",
+            "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::json",
+      "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/8.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/8.json
new file mode 100644
index 0000000..2812934
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/8.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::float32",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::float32>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::float32",
+          "value": {
+            "type": "std::float32",
+            "value": -17.645004
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float32",
+      "value": -17.645004
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/80.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/80.json
new file mode 100644
index 0000000..68d8a04
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/80.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_datetime",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_datetime>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_datetime",
+          "value": {
+            "type": "cal::local_datetime",
+            "value": "2771-07-01T13:38:56.7149520"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_datetime",
+      "value": "2771-07-01T13:38:56.7149520"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/81.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/81.json
new file mode 100644
index 0000000..e38654f
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/81.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_date",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_date>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_date",
+          "value": {
+            "type": "cal::local_date",
+            "value": "0207-05-04"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_date",
+      "value": "0207-05-04"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/82.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/82.json
new file mode 100644
index 0000000..b33d34b
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/82.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::local_time",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::local_time>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::local_time",
+          "value": {
+            "type": "cal::local_time",
+            "value": "22:16:24.6119380"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::local_time",
+      "value": "22:16:24.6119380"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/83.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/83.json
new file mode 100644
index 0000000..5f8d8d1
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/83.json
@@ -0,0 +1,44 @@
+{
+  "name": "Argument of type range<std::int32>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <range<std::int32>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "range<std::int32>",
+          "value": {
+            "type": "range",
+            "value": {
+              "lower": 1800567490,
+              "upper": 1944665482,
+              "inc_lower": true,
+              "inc_upper": false
+            },
+            "element_type": "std::int32"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "range",
+      "value": {
+        "lower": 1800567490,
+        "upper": 1944665482,
+        "inc_lower": true,
+        "inc_upper": false
+      },
+      "element_type": "std::int32"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/84.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/84.json
new file mode 100644
index 0000000..6eda077
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/84.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type cal::relative_duration",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <cal::relative_duration>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "cal::relative_duration",
+          "value": {
+            "type": "cal::relative_duration",
+            "value": "72.00:00:00"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "cal::relative_duration",
+      "value": "72.00:00:00"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/85.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/85.json
new file mode 100644
index 0000000..91e3a3c
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/85.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::str",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::str>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::str",
+          "value": {
+            "type": "std::str",
+            "value": "VPKUXXHNALRZQGS"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::str",
+      "value": "VPKUXXHNALRZQGS"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/86.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/86.json
new file mode 100644
index 0000000..af22790
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/86.json
@@ -0,0 +1,1152 @@
+{
+  "name": "Argument of type tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>, std::uuid>, std::uuid>, std::uuid>",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>, std::uuid>, std::uuid>, std::uuid>>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<array<std::bigint>, std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, range<std::int32>, cal::relative_duration, std::str, tuple<std::bigint, std::bool, std::bytes, cal::date_duration, std::datetime, std::decimal, std::duration, std::float32, std::float64, std::int16, std::int32, std::int64, std::json, cal::local_datetime, cal::local_date, cal::local_time, cal::relative_duration, std::str, std::uuid>, std::uuid>, std::uuid>, std::uuid>",
+          "value": {
+            "type": "tuple",
+            "value": [
+              {
+                "type": "array",
+                "value": [
+                  {
+                    "type": "std::bigint",
+                    "value": -236516399
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 501334235295
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 30099507980330712191234
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 1224789155023295644249
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 89141773714665
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 767252748942648274
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 131272658391867
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -9103496490514861653210871516425
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -846525309506210217377203223744
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -303758082436342068397750
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -20448392344268746786182
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -80605873725
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 1090317306357051996072
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": 1206419668192773018023
+                  }
+                ],
+                "element_type": "std::bigint"
+              },
+              {
+                "type": "std::bigint",
+                "value": -196782133909
+              },
+              {
+                "type": "std::bool",
+                "value": true
+              },
+              {
+                "type": "std::bytes",
+                "value": "TE9SSE1HUVJVVw=="
+              },
+              {
+                "type": "cal::date_duration",
+                "value": "-27062.00:00:00"
+              },
+              {
+                "type": "std::datetime",
+                "value": "4176-08-12T15:23:44.881008-03:00"
+              },
+              {
+                "type": "std::decimal",
+                "value": 35.645313188734145
+              },
+              {
+                "type": "std::duration",
+                "value": "107.00:00:00"
+              },
+              {
+                "type": "std::float32",
+                "value": -23.63306
+              },
+              {
+                "type": "std::float64",
+                "value": -39.511211225535355
+              },
+              {
+                "type": "std::int16",
+                "value": 22883
+              },
+              {
+                "type": "std::int32",
+                "value": 1735156361
+              },
+              {
+                "type": "std::int64",
+                "value": 4141612181358197313
+              },
+              {
+                "type": "std::json",
+                "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+              },
+              {
+                "type": "cal::local_datetime",
+                "value": "1010-04-13T21:18:52.8929800"
+              },
+              {
+                "type": "cal::local_date",
+                "value": "9354-10-02"
+              },
+              {
+                "type": "cal::local_time",
+                "value": "12:36:17.8872190"
+              },
+              {
+                "type": "range",
+                "value": {
+                  "lower": 161698216,
+                  "upper": 164841790,
+                  "inc_lower": true,
+                  "inc_upper": false
+                },
+                "element_type": "std::int32"
+              },
+              {
+                "type": "cal::relative_duration",
+                "value": "67.00:00:00"
+              },
+              {
+                "type": "std::str",
+                "value": "EWLHFDMDMIBLCPS"
+              },
+              {
+                "type": "tuple",
+                "value": [
+                  {
+                    "type": "array",
+                    "value": [
+                      {
+                        "type": "std::bigint",
+                        "value": 282907562077841974100115
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": -30997622748934568644256769191
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": 830572980148618047515254584003446
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": 884441849515442120003031328467818
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": 1177120753395020643554
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": 1999925168708026497503
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": 1123752600523178571282261093222499
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": -1843079335380472770699047491475123
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": 27683129668914997
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": -1884012673
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": -30607253054704183
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": 4207314248651232
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": -2350758182230699655600
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": 702606145
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": 84397666505317909857656
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": 921763156
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": 4462656014164776039
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": 2226775184129368624904
+                      }
+                    ],
+                    "element_type": "std::bigint"
+                  },
+                  {
+                    "type": "std::bigint",
+                    "value": -24955082089115745240480343
+                  },
+                  {
+                    "type": "std::bool",
+                    "value": false
+                  },
+                  {
+                    "type": "std::bytes",
+                    "value": "NFZRUDdUSVpDVzBW"
+                  },
+                  {
+                    "type": "cal::date_duration",
+                    "value": "10171.00:00:00"
+                  },
+                  {
+                    "type": "std::datetime",
+                    "value": "7086-02-10T23:34:50.257472-04:00"
+                  },
+                  {
+                    "type": "std::decimal",
+                    "value": 25.879849720224668
+                  },
+                  {
+                    "type": "std::duration",
+                    "value": "94.00:00:00"
+                  },
+                  {
+                    "type": "std::float32",
+                    "value": 16.760061
+                  },
+                  {
+                    "type": "std::float64",
+                    "value": -75.3525300972874
+                  },
+                  {
+                    "type": "std::int16",
+                    "value": 25842
+                  },
+                  {
+                    "type": "std::int32",
+                    "value": 1101862226
+                  },
+                  {
+                    "type": "std::int64",
+                    "value": 7807558746559071371
+                  },
+                  {
+                    "type": "std::json",
+                    "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+                  },
+                  {
+                    "type": "cal::local_datetime",
+                    "value": "4656-08-16T04:42:09.8979040"
+                  },
+                  {
+                    "type": "cal::local_date",
+                    "value": "3965-11-26"
+                  },
+                  {
+                    "type": "cal::local_time",
+                    "value": "22:53:35.0307810"
+                  },
+                  {
+                    "type": "range",
+                    "value": {
+                      "lower": 107909721,
+                      "upper": 1950407406,
+                      "inc_lower": true,
+                      "inc_upper": false
+                    },
+                    "element_type": "std::int32"
+                  },
+                  {
+                    "type": "cal::relative_duration",
+                    "value": "74.00:00:00"
+                  },
+                  {
+                    "type": "std::str",
+                    "value": "DAYUYZVVVGSQAKX"
+                  },
+                  {
+                    "type": "tuple",
+                    "value": [
+                      {
+                        "type": "array",
+                        "value": [
+                          {
+                            "type": "std::bigint",
+                            "value": 6370093870445993760794201318326
+                          },
+                          {
+                            "type": "std::bigint",
+                            "value": -2291082809404743070045821530578341
+                          },
+                          {
+                            "type": "std::bigint",
+                            "value": 3989586925308109655
+                          },
+                          {
+                            "type": "std::bigint",
+                            "value": -11167700121340636192275897
+                          },
+                          {
+                            "type": "std::bigint",
+                            "value": 36214931387755193478537885643
+                          },
+                          {
+                            "type": "std::bigint",
+                            "value": 2233179673183300727932328768881152
+                          },
+                          {
+                            "type": "std::bigint",
+                            "value": -445480015132
+                          },
+                          {
+                            "type": "std::bigint",
+                            "value": 153522729922477312040381324
+                          },
+                          {
+                            "type": "std::bigint",
+                            "value": 103354518932
+                          },
+                          {
+                            "type": "std::bigint",
+                            "value": 918983136649677048
+                          },
+                          {
+                            "type": "std::bigint",
+                            "value": -893049232228096697739
+                          },
+                          {
+                            "type": "std::bigint",
+                            "value": -450874871662383857419051
+                          },
+                          {
+                            "type": "std::bigint",
+                            "value": 94144111465171
+                          },
+                          {
+                            "type": "std::bigint",
+                            "value": -1907998731
+                          },
+                          {
+                            "type": "std::bigint",
+                            "value": -14128990619342822
+                          },
+                          {
+                            "type": "std::bigint",
+                            "value": 905167940288274383058
+                          }
+                        ],
+                        "element_type": "std::bigint"
+                      },
+                      {
+                        "type": "std::bigint",
+                        "value": 1228403098450633735350161318361820
+                      },
+                      {
+                        "type": "std::bool",
+                        "value": false
+                      },
+                      {
+                        "type": "std::bytes",
+                        "value": "OEtHSzdJVE1DMTQ="
+                      },
+                      {
+                        "type": "cal::date_duration",
+                        "value": "-1421.00:00:00"
+                      },
+                      {
+                        "type": "std::datetime",
+                        "value": "2407-05-19T23:37:55.557532-03:00"
+                      },
+                      {
+                        "type": "std::decimal",
+                        "value": 10.855598318788944
+                      },
+                      {
+                        "type": "std::duration",
+                        "value": "460.00:00:00"
+                      },
+                      {
+                        "type": "std::float32",
+                        "value": -3.2706027
+                      },
+                      {
+                        "type": "std::float64",
+                        "value": -11.734586795668392
+                      },
+                      {
+                        "type": "std::int16",
+                        "value": 27414
+                      },
+                      {
+                        "type": "std::int32",
+                        "value": 1772330848
+                      },
+                      {
+                        "type": "std::int64",
+                        "value": 1051279091667011545
+                      },
+                      {
+                        "type": "std::json",
+                        "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+                      },
+                      {
+                        "type": "cal::local_datetime",
+                        "value": "7308-12-02T18:58:42.1303680"
+                      },
+                      {
+                        "type": "cal::local_date",
+                        "value": "3936-08-08"
+                      },
+                      {
+                        "type": "cal::local_time",
+                        "value": "12:56:37.1974380"
+                      },
+                      {
+                        "type": "range",
+                        "value": {
+                          "lower": 1464111193,
+                          "upper": 1507332224,
+                          "inc_lower": true,
+                          "inc_upper": false
+                        },
+                        "element_type": "std::int32"
+                      },
+                      {
+                        "type": "cal::relative_duration",
+                        "value": "50.00:00:00"
+                      },
+                      {
+                        "type": "std::str",
+                        "value": "ARCVBRDZEAZGPXW"
+                      },
+                      {
+                        "type": "tuple",
+                        "value": [
+                          {
+                            "type": "std::bigint",
+                            "value": 432867449681319733228242
+                          },
+                          {
+                            "type": "std::bool",
+                            "value": false
+                          },
+                          {
+                            "type": "std::bytes",
+                            "value": "MEU0VzFBNUpQSURZSTJYNA=="
+                          },
+                          {
+                            "type": "cal::date_duration",
+                            "value": "29002.00:00:00"
+                          },
+                          {
+                            "type": "std::datetime",
+                            "value": "5283-01-28T23:23:33.274912-04:00"
+                          },
+                          {
+                            "type": "std::decimal",
+                            "value": 41.28079813778436
+                          },
+                          {
+                            "type": "std::duration",
+                            "value": "90.00:00:00"
+                          },
+                          {
+                            "type": "std::float32",
+                            "value": -5.6345716
+                          },
+                          {
+                            "type": "std::float64",
+                            "value": -55.53931100086277
+                          },
+                          {
+                            "type": "std::int16",
+                            "value": 6304
+                          },
+                          {
+                            "type": "std::int32",
+                            "value": 160491739
+                          },
+                          {
+                            "type": "std::int64",
+                            "value": 328082278396055127
+                          },
+                          {
+                            "type": "std::json",
+                            "value": "{\"DateOnly\":\"8173-06-07\",\"Days\":2254800}"
+                          },
+                          {
+                            "type": "cal::local_datetime",
+                            "value": "4609-04-27T22:37:04.1460640"
+                          },
+                          {
+                            "type": "cal::local_date",
+                            "value": "0088-03-05"
+                          },
+                          {
+                            "type": "cal::local_time",
+                            "value": "17:50:46.8754900"
+                          },
+                          {
+                            "type": "cal::relative_duration",
+                            "value": "18.00:00:00"
+                          },
+                          {
+                            "type": "std::str",
+                            "value": "NPCQDFWEITSQDHX"
+                          },
+                          {
+                            "type": "std::uuid",
+                            "value": "da98a320-3754-0f73-2efa-a8ceab08078a"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "std::uuid",
+                        "value": "361eab1b-f277-6507-7ccf-44224fbedc57"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "std::uuid",
+                    "value": "b09a52bb-4f94-f0e3-c100-27523b3d75b3"
+                  }
+                ]
+              },
+              {
+                "type": "std::uuid",
+                "value": "0e36db4f-0664-2e5b-9b33-5e85f351bf6f"
+              }
+            ]
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "tuple",
+      "value": [
+        {
+          "type": "array",
+          "value": [
+            {
+              "type": "std::bigint",
+              "value": -236516399
+            },
+            {
+              "type": "std::bigint",
+              "value": 501334235295
+            },
+            {
+              "type": "std::bigint",
+              "value": 30099507980330712191234
+            },
+            {
+              "type": "std::bigint",
+              "value": 1224789155023295644249
+            },
+            {
+              "type": "std::bigint",
+              "value": 89141773714665
+            },
+            {
+              "type": "std::bigint",
+              "value": 767252748942648274
+            },
+            {
+              "type": "std::bigint",
+              "value": 131272658391867
+            },
+            {
+              "type": "std::bigint",
+              "value": -9103496490514861653210871516425
+            },
+            {
+              "type": "std::bigint",
+              "value": -846525309506210217377203223744
+            },
+            {
+              "type": "std::bigint",
+              "value": -303758082436342068397750
+            },
+            {
+              "type": "std::bigint",
+              "value": -20448392344268746786182
+            },
+            {
+              "type": "std::bigint",
+              "value": -80605873725
+            },
+            {
+              "type": "std::bigint",
+              "value": 1090317306357051996072
+            },
+            {
+              "type": "std::bigint",
+              "value": 1206419668192773018023
+            }
+          ],
+          "element_type": "std::bigint"
+        },
+        {
+          "type": "std::bigint",
+          "value": -196782133909
+        },
+        {
+          "type": "std::bool",
+          "value": true
+        },
+        {
+          "type": "std::bytes",
+          "value": "TE9SSE1HUVJVVw=="
+        },
+        {
+          "type": "cal::date_duration",
+          "value": "-27062.00:00:00"
+        },
+        {
+          "type": "std::datetime",
+          "value": "4176-08-12T15:23:44.881008-03:00"
+        },
+        {
+          "type": "std::decimal",
+          "value": 35.645313188734145
+        },
+        {
+          "type": "std::duration",
+          "value": "107.00:00:00"
+        },
+        {
+          "type": "std::float32",
+          "value": -23.63306
+        },
+        {
+          "type": "std::float64",
+          "value": -39.511211225535355
+        },
+        {
+          "type": "std::int16",
+          "value": 22883
+        },
+        {
+          "type": "std::int32",
+          "value": 1735156361
+        },
+        {
+          "type": "std::int64",
+          "value": 4141612181358197313
+        },
+        {
+          "type": "std::json",
+          "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+        },
+        {
+          "type": "cal::local_datetime",
+          "value": "1010-04-13T21:18:52.8929800"
+        },
+        {
+          "type": "cal::local_date",
+          "value": "9354-10-02"
+        },
+        {
+          "type": "cal::local_time",
+          "value": "12:36:17.8872190"
+        },
+        {
+          "type": "range",
+          "value": {
+            "lower": 161698216,
+            "upper": 164841790,
+            "inc_lower": true,
+            "inc_upper": false
+          },
+          "element_type": "std::int32"
+        },
+        {
+          "type": "cal::relative_duration",
+          "value": "67.00:00:00"
+        },
+        {
+          "type": "std::str",
+          "value": "EWLHFDMDMIBLCPS"
+        },
+        {
+          "type": "tuple",
+          "value": [
+            {
+              "type": "array",
+              "value": [
+                {
+                  "type": "std::bigint",
+                  "value": 282907562077841974100115
+                },
+                {
+                  "type": "std::bigint",
+                  "value": -30997622748934568644256769191
+                },
+                {
+                  "type": "std::bigint",
+                  "value": 830572980148618047515254584003446
+                },
+                {
+                  "type": "std::bigint",
+                  "value": 884441849515442120003031328467818
+                },
+                {
+                  "type": "std::bigint",
+                  "value": 1177120753395020643554
+                },
+                {
+                  "type": "std::bigint",
+                  "value": 1999925168708026497503
+                },
+                {
+                  "type": "std::bigint",
+                  "value": 1123752600523178571282261093222499
+                },
+                {
+                  "type": "std::bigint",
+                  "value": -1843079335380472770699047491475123
+                },
+                {
+                  "type": "std::bigint",
+                  "value": 27683129668914997
+                },
+                {
+                  "type": "std::bigint",
+                  "value": -1884012673
+                },
+                {
+                  "type": "std::bigint",
+                  "value": -30607253054704183
+                },
+                {
+                  "type": "std::bigint",
+                  "value": 4207314248651232
+                },
+                {
+                  "type": "std::bigint",
+                  "value": -2350758182230699655600
+                },
+                {
+                  "type": "std::bigint",
+                  "value": 702606145
+                },
+                {
+                  "type": "std::bigint",
+                  "value": 84397666505317909857656
+                },
+                {
+                  "type": "std::bigint",
+                  "value": 921763156
+                },
+                {
+                  "type": "std::bigint",
+                  "value": 4462656014164776039
+                },
+                {
+                  "type": "std::bigint",
+                  "value": 2226775184129368624904
+                }
+              ],
+              "element_type": "std::bigint"
+            },
+            {
+              "type": "std::bigint",
+              "value": -24955082089115745240480343
+            },
+            {
+              "type": "std::bool",
+              "value": false
+            },
+            {
+              "type": "std::bytes",
+              "value": "NFZRUDdUSVpDVzBW"
+            },
+            {
+              "type": "cal::date_duration",
+              "value": "10171.00:00:00"
+            },
+            {
+              "type": "std::datetime",
+              "value": "7086-02-10T23:34:50.257472-04:00"
+            },
+            {
+              "type": "std::decimal",
+              "value": 25.879849720224668
+            },
+            {
+              "type": "std::duration",
+              "value": "94.00:00:00"
+            },
+            {
+              "type": "std::float32",
+              "value": 16.760061
+            },
+            {
+              "type": "std::float64",
+              "value": -75.3525300972874
+            },
+            {
+              "type": "std::int16",
+              "value": 25842
+            },
+            {
+              "type": "std::int32",
+              "value": 1101862226
+            },
+            {
+              "type": "std::int64",
+              "value": 7807558746559071371
+            },
+            {
+              "type": "std::json",
+              "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+            },
+            {
+              "type": "cal::local_datetime",
+              "value": "4656-08-16T04:42:09.8979040"
+            },
+            {
+              "type": "cal::local_date",
+              "value": "3965-11-26"
+            },
+            {
+              "type": "cal::local_time",
+              "value": "22:53:35.0307810"
+            },
+            {
+              "type": "range",
+              "value": {
+                "lower": 107909721,
+                "upper": 1950407406,
+                "inc_lower": true,
+                "inc_upper": false
+              },
+              "element_type": "std::int32"
+            },
+            {
+              "type": "cal::relative_duration",
+              "value": "74.00:00:00"
+            },
+            {
+              "type": "std::str",
+              "value": "DAYUYZVVVGSQAKX"
+            },
+            {
+              "type": "tuple",
+              "value": [
+                {
+                  "type": "array",
+                  "value": [
+                    {
+                      "type": "std::bigint",
+                      "value": 6370093870445993760794201318326
+                    },
+                    {
+                      "type": "std::bigint",
+                      "value": -2291082809404743070045821530578341
+                    },
+                    {
+                      "type": "std::bigint",
+                      "value": 3989586925308109655
+                    },
+                    {
+                      "type": "std::bigint",
+                      "value": -11167700121340636192275897
+                    },
+                    {
+                      "type": "std::bigint",
+                      "value": 36214931387755193478537885643
+                    },
+                    {
+                      "type": "std::bigint",
+                      "value": 2233179673183300727932328768881152
+                    },
+                    {
+                      "type": "std::bigint",
+                      "value": -445480015132
+                    },
+                    {
+                      "type": "std::bigint",
+                      "value": 153522729922477312040381324
+                    },
+                    {
+                      "type": "std::bigint",
+                      "value": 103354518932
+                    },
+                    {
+                      "type": "std::bigint",
+                      "value": 918983136649677048
+                    },
+                    {
+                      "type": "std::bigint",
+                      "value": -893049232228096697739
+                    },
+                    {
+                      "type": "std::bigint",
+                      "value": -450874871662383857419051
+                    },
+                    {
+                      "type": "std::bigint",
+                      "value": 94144111465171
+                    },
+                    {
+                      "type": "std::bigint",
+                      "value": -1907998731
+                    },
+                    {
+                      "type": "std::bigint",
+                      "value": -14128990619342822
+                    },
+                    {
+                      "type": "std::bigint",
+                      "value": 905167940288274383058
+                    }
+                  ],
+                  "element_type": "std::bigint"
+                },
+                {
+                  "type": "std::bigint",
+                  "value": 1228403098450633735350161318361820
+                },
+                {
+                  "type": "std::bool",
+                  "value": false
+                },
+                {
+                  "type": "std::bytes",
+                  "value": "OEtHSzdJVE1DMTQ="
+                },
+                {
+                  "type": "cal::date_duration",
+                  "value": "-1421.00:00:00"
+                },
+                {
+                  "type": "std::datetime",
+                  "value": "2407-05-19T23:37:55.557532-03:00"
+                },
+                {
+                  "type": "std::decimal",
+                  "value": 10.855598318788944
+                },
+                {
+                  "type": "std::duration",
+                  "value": "460.00:00:00"
+                },
+                {
+                  "type": "std::float32",
+                  "value": -3.2706027
+                },
+                {
+                  "type": "std::float64",
+                  "value": -11.734586795668392
+                },
+                {
+                  "type": "std::int16",
+                  "value": 27414
+                },
+                {
+                  "type": "std::int32",
+                  "value": 1772330848
+                },
+                {
+                  "type": "std::int64",
+                  "value": 1051279091667011545
+                },
+                {
+                  "type": "std::json",
+                  "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+                },
+                {
+                  "type": "cal::local_datetime",
+                  "value": "7308-12-02T18:58:42.1303680"
+                },
+                {
+                  "type": "cal::local_date",
+                  "value": "3936-08-08"
+                },
+                {
+                  "type": "cal::local_time",
+                  "value": "12:56:37.1974380"
+                },
+                {
+                  "type": "range",
+                  "value": {
+                    "lower": 1464111193,
+                    "upper": 1507332224,
+                    "inc_lower": true,
+                    "inc_upper": false
+                  },
+                  "element_type": "std::int32"
+                },
+                {
+                  "type": "cal::relative_duration",
+                  "value": "50.00:00:00"
+                },
+                {
+                  "type": "std::str",
+                  "value": "ARCVBRDZEAZGPXW"
+                },
+                {
+                  "type": "tuple",
+                  "value": [
+                    {
+                      "type": "std::bigint",
+                      "value": 432867449681319733228242
+                    },
+                    {
+                      "type": "std::bool",
+                      "value": false
+                    },
+                    {
+                      "type": "std::bytes",
+                      "value": "MEU0VzFBNUpQSURZSTJYNA=="
+                    },
+                    {
+                      "type": "cal::date_duration",
+                      "value": "29002.00:00:00"
+                    },
+                    {
+                      "type": "std::datetime",
+                      "value": "5283-01-28T23:23:33.274912-04:00"
+                    },
+                    {
+                      "type": "std::decimal",
+                      "value": 41.28079813778436
+                    },
+                    {
+                      "type": "std::duration",
+                      "value": "90.00:00:00"
+                    },
+                    {
+                      "type": "std::float32",
+                      "value": -5.6345716
+                    },
+                    {
+                      "type": "std::float64",
+                      "value": -55.53931100086277
+                    },
+                    {
+                      "type": "std::int16",
+                      "value": 6304
+                    },
+                    {
+                      "type": "std::int32",
+                      "value": 160491739
+                    },
+                    {
+                      "type": "std::int64",
+                      "value": 328082278396055127
+                    },
+                    {
+                      "type": "std::json",
+                      "value": "{\"Days\": 2254800, \"DateOnly\": \"8173-06-07\"}"
+                    },
+                    {
+                      "type": "cal::local_datetime",
+                      "value": "4609-04-27T22:37:04.1460640"
+                    },
+                    {
+                      "type": "cal::local_date",
+                      "value": "0088-03-05"
+                    },
+                    {
+                      "type": "cal::local_time",
+                      "value": "17:50:46.8754900"
+                    },
+                    {
+                      "type": "cal::relative_duration",
+                      "value": "18.00:00:00"
+                    },
+                    {
+                      "type": "std::str",
+                      "value": "NPCQDFWEITSQDHX"
+                    },
+                    {
+                      "type": "std::uuid",
+                      "value": "da98a320-3754-0f73-2efa-a8ceab08078a"
+                    }
+                  ]
+                },
+                {
+                  "type": "std::uuid",
+                  "value": "361eab1b-f277-6507-7ccf-44224fbedc57"
+                }
+              ]
+            },
+            {
+              "type": "std::uuid",
+              "value": "b09a52bb-4f94-f0e3-c100-27523b3d75b3"
+            }
+          ]
+        },
+        {
+          "type": "std::uuid",
+          "value": "0e36db4f-0664-2e5b-9b33-5e85f351bf6f"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/87.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/87.json
new file mode 100644
index 0000000..f4b373e
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/87.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::uuid",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::uuid>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::uuid",
+          "value": {
+            "type": "std::uuid",
+            "value": "5812501d-576e-ccf6-c82d-7577cab5293e"
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::uuid",
+      "value": "5812501d-576e-ccf6-c82d-7577cab5293e"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/driver/src/test/java/shared/testdefs/v3_arguments/9.json b/src/driver/src/test/java/shared/testdefs/v3_arguments/9.json
new file mode 100644
index 0000000..e0fec93
--- /dev/null
+++ b/src/driver/src/test/java/shared/testdefs/v3_arguments/9.json
@@ -0,0 +1,32 @@
+{
+  "name": "Argument of type std::float64",
+  "queries": [
+    {
+      "cardinality": 109,
+      "value": "SELECT <std::float64>$arg",
+      "arguments": [
+        {
+          "name": "arg",
+          "edgedb_typename": "std::float64",
+          "value": {
+            "type": "std::float64",
+            "value": 45.26002305292525
+          }
+        }
+      ],
+      "capabilities": 0,
+      "session": {
+        "module": "default",
+        "aliases": {},
+        "config": {},
+        "globals": {}
+      }
+    }
+  ],
+  "result": [
+    {
+      "type": "std::float64",
+      "value": 45.26002305292525
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tools/testgen/src/main/java/com/edgedb/testgen/Main.java b/tools/testgen/src/main/java/com/edgedb/testgen/Main.java
index 0420ef8..fbf8e1a 100644
--- a/tools/testgen/src/main/java/com/edgedb/testgen/Main.java
+++ b/tools/testgen/src/main/java/com/edgedb/testgen/Main.java
@@ -10,8 +10,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 
 public class Main {
-    private static final String TEST_DEFINITION_DIRECTORY = "C:\\Users\\lynch\\source\\repos\\EdgeDB\\tests\\EdgeDB.Tests.Integration\\tests";
-    private static final String TEST_OUTPUT_DIRECTORY = "C:\\Users\\lynch\\Documents\\GitHub\\edgedb-java\\src\\driver\\src\\test\\java\\shared\\generated";
+    private static final Path TEST_DEFINITION_DIRECTORY = Path.of("src", "driver", "src", "test", "java", "shared", "testdefs");
+    private static final Path TEST_OUTPUT_DIRECTORY = Path.of("src", "driver", "src", "test", "java", "shared", "generated");
 
     private static final NamingStrategy PASCAL_CASE_NAMING_STRATEGY = NamingStrategy.pascalCase();
     private static final NamingStrategy CAMEL_CASE_NAMING_STRATEGY = NamingStrategy.camelCase();
@@ -20,7 +20,9 @@ public class Main {
             .setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE);
 
     public static void main(String[] args) throws IOException {
-        var definitionDir = new File(TEST_DEFINITION_DIRECTORY);
+        var dir =  Path.of(System.getProperty("user.dir"));
+
+        var definitionDir = dir.resolve(TEST_DEFINITION_DIRECTORY).toFile();
 
         var files = definitionDir.listFiles((d,e) -> d.getAbsolutePath() == definitionDir.getAbsolutePath() && e.endsWith(".json"));
 
@@ -30,7 +32,7 @@ public class Main {
 
         for(var file : files) {
             var group = mapper.readValue(Files.readString(file.toPath(), StandardCharsets.UTF_8), TestGroup.class);
-            var testFiles = Path.of(TEST_DEFINITION_DIRECTORY, file.getName().replace(".json", "")).toFile().listFiles();
+            var testFiles = dir.resolve(TEST_DEFINITION_DIRECTORY).resolve(file.getName().replace(".json", "")).toFile().listFiles();
             processGroup(group, testFiles);
         }
     }
@@ -38,7 +40,8 @@ public class Main {
     private static final String[] usings = new String[] {
             "org.junit.jupiter.api.Test",
             "org.junit.jupiter.api.DisplayName",
-            "shared.SharedTestsRunner"
+            "shared.SharedTestsRunner",
+            "java.nio.file.Path"
     };
 
     private static void processGroup(TestGroup group, File[] tests) throws IOException {
@@ -63,7 +66,7 @@ public class Main {
                 writer.appendLine("@DisplayName(\"" + test.name + "\")");
 
                 try (var methodScope = writer.beginScope("public void " + camelCaseName + "_" + testFile.getName().replace(".json", "") + "()")) {
-                    writer.appendLine("var path = \"" + testFile.getAbsolutePath().replace("\\", "\\\\") + "\";");
+                    writer.appendLine("var path = Path.of(\"" + TEST_DEFINITION_DIRECTORY.resolve(testFile.getParentFile().getName()).resolve(testFile.getName()).toString().replace(System.getProperty("file.separator"), "\", \"") + "\");");
                     writer.appendLine("SharedTestsRunner.Run(path);");
                 }
             }
@@ -72,7 +75,7 @@ public class Main {
             throw new RuntimeException(e);
         }
 
-        Files.write(Path.of(TEST_OUTPUT_DIRECTORY, pascalGroupName + "Tests" + ".java"), writer.toString().getBytes(StandardCharsets.UTF_8));
+        Files.write(TEST_OUTPUT_DIRECTORY.resolve(pascalGroupName + "Tests" + ".java"), writer.toString().getBytes(StandardCharsets.UTF_8));
     }
 
     private static Test readTest(File file) throws IOException {