diff --git a/presto-jdbc/src/main/java/com/facebook/presto/jdbc/ColumnInfo.java b/presto-jdbc/src/main/java/com/facebook/presto/jdbc/ColumnInfo.java
index 69c383dd2fa4..a87243404c3d 100644
--- a/presto-jdbc/src/main/java/com/facebook/presto/jdbc/ColumnInfo.java
+++ b/presto-jdbc/src/main/java/com/facebook/presto/jdbc/ColumnInfo.java
@@ -220,11 +220,11 @@ private static int getType(TypeSignature type)
             case "double":
                 return Types.DOUBLE;
             case "varchar":
-                return Types.LONGNVARCHAR;
+                return Types.VARCHAR;
             case "char":
                 return Types.CHAR;
             case "varbinary":
-                return Types.LONGVARBINARY;
+                return Types.VARBINARY;
             case "time":
                 return Types.TIME;
             case "time with time zone":
diff --git a/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestJdbcPreparedStatement.java b/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestJdbcPreparedStatement.java
index 5793f57ba52d..140a8fb5beb1 100644
--- a/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestJdbcPreparedStatement.java
+++ b/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestJdbcPreparedStatement.java
@@ -176,15 +176,15 @@ public void testSetNull()
         assertSetNull(Types.NUMERIC, Types.DECIMAL);
         assertSetNull(Types.CHAR);
         assertSetNull(Types.NCHAR, Types.CHAR);
-        assertSetNull(Types.VARCHAR, Types.LONGNVARCHAR);
-        assertSetNull(Types.NVARCHAR, Types.LONGNVARCHAR);
-        assertSetNull(Types.LONGVARCHAR, Types.LONGNVARCHAR);
-        assertSetNull(Types.LONGNVARCHAR, Types.LONGNVARCHAR);
-        assertSetNull(Types.CLOB, Types.LONGNVARCHAR);
-        assertSetNull(Types.NCLOB, Types.LONGNVARCHAR);
-        assertSetNull(Types.VARBINARY, Types.LONGVARBINARY);
-        assertSetNull(Types.LONGVARBINARY);
-        assertSetNull(Types.BLOB, Types.LONGVARBINARY);
+        assertSetNull(Types.VARCHAR, Types.VARCHAR);
+        assertSetNull(Types.NVARCHAR, Types.VARCHAR);
+        assertSetNull(Types.LONGVARCHAR, Types.VARCHAR);
+        assertSetNull(Types.VARCHAR, Types.VARCHAR);
+        assertSetNull(Types.CLOB, Types.VARCHAR);
+        assertSetNull(Types.NCLOB, Types.VARCHAR);
+        assertSetNull(Types.VARBINARY, Types.VARBINARY);
+        assertSetNull(Types.VARBINARY);
+        assertSetNull(Types.BLOB, Types.VARBINARY);
         assertSetNull(Types.DATE);
         assertSetNull(Types.TIME);
         assertSetNull(Types.TIMESTAMP);
@@ -387,26 +387,26 @@ public void testConvertDecimal()
     public void testConvertVarchar()
             throws SQLException
     {
-        assertParameter("hello", Types.LONGNVARCHAR, (ps, i) -> ps.setString(i, "hello"));
-        assertParameter("hello", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, "hello"));
+        assertParameter("hello", Types.VARCHAR, (ps, i) -> ps.setString(i, "hello"));
+        assertParameter("hello", Types.VARCHAR, (ps, i) -> ps.setObject(i, "hello"));
 
         String unicodeAndNull = "abc'xyz\0\u2603\uD835\uDCABtest";
-        assertParameter(unicodeAndNull, Types.LONGNVARCHAR, (ps, i) -> ps.setString(i, unicodeAndNull));
+        assertParameter(unicodeAndNull, Types.VARCHAR, (ps, i) -> ps.setString(i, unicodeAndNull));
 
         for (int type : asList(Types.CHAR, Types.NCHAR, Types.VARCHAR, Types.NVARCHAR, Types.LONGVARCHAR, Types.LONGNVARCHAR)) {
-            assertParameter("123", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, (byte) 123, type));
-            assertParameter("123", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, (byte) 123, type));
-            assertParameter("123", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, (short) 123, type));
-            assertParameter("123", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, 123, type));
-            assertParameter("123", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, 123L, type));
-            assertParameter("123.9", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, 123.9f, type));
-            assertParameter("123.9", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, 123.9d, type));
-            assertParameter("123", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, BigInteger.valueOf(123), type));
-            assertParameter("123", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), type));
-            assertParameter("123.9", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), type));
-            assertParameter("hello", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, "hello", type));
-            assertParameter("true", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, true, type));
-            assertParameter("false", Types.LONGNVARCHAR, (ps, i) -> ps.setObject(i, false, type));
+            assertParameter("123", Types.VARCHAR, (ps, i) -> ps.setObject(i, (byte) 123, type));
+            assertParameter("123", Types.VARCHAR, (ps, i) -> ps.setObject(i, (byte) 123, type));
+            assertParameter("123", Types.VARCHAR, (ps, i) -> ps.setObject(i, (short) 123, type));
+            assertParameter("123", Types.VARCHAR, (ps, i) -> ps.setObject(i, 123, type));
+            assertParameter("123", Types.VARCHAR, (ps, i) -> ps.setObject(i, 123L, type));
+            assertParameter("123.9", Types.VARCHAR, (ps, i) -> ps.setObject(i, 123.9f, type));
+            assertParameter("123.9", Types.VARCHAR, (ps, i) -> ps.setObject(i, 123.9d, type));
+            assertParameter("123", Types.VARCHAR, (ps, i) -> ps.setObject(i, BigInteger.valueOf(123), type));
+            assertParameter("123", Types.VARCHAR, (ps, i) -> ps.setObject(i, BigDecimal.valueOf(123), type));
+            assertParameter("123.9", Types.VARCHAR, (ps, i) -> ps.setObject(i, BigDecimal.valueOf(123.9), type));
+            assertParameter("hello", Types.VARCHAR, (ps, i) -> ps.setObject(i, "hello", type));
+            assertParameter("true", Types.VARCHAR, (ps, i) -> ps.setObject(i, true, type));
+            assertParameter("false", Types.VARCHAR, (ps, i) -> ps.setObject(i, false, type));
         }
     }
 
@@ -417,12 +417,12 @@ public void testConvertVarbinary()
         String value = "abc\0xyz";
         byte[] bytes = value.getBytes(UTF_8);
 
-        assertParameter(bytes, Types.LONGVARBINARY, (ps, i) -> ps.setBytes(i, bytes));
-        assertParameter(bytes, Types.LONGVARBINARY, (ps, i) -> ps.setObject(i, bytes));
+        assertParameter(bytes, Types.VARBINARY, (ps, i) -> ps.setBytes(i, bytes));
+        assertParameter(bytes, Types.VARBINARY, (ps, i) -> ps.setObject(i, bytes));
 
         for (int type : asList(Types.BINARY, Types.VARBINARY, Types.LONGVARBINARY)) {
-            assertParameter(bytes, Types.LONGVARBINARY, (ps, i) -> ps.setObject(i, bytes, type));
-            assertParameter(bytes, Types.LONGVARBINARY, (ps, i) -> ps.setObject(i, value, type));
+            assertParameter(bytes, Types.VARBINARY, (ps, i) -> ps.setObject(i, bytes, type));
+            assertParameter(bytes, Types.VARBINARY, (ps, i) -> ps.setObject(i, value, type));
         }
     }
 
diff --git a/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestJdbcResultSet.java b/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestJdbcResultSet.java
index 531a30b868bc..769fb8f5ad09 100644
--- a/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestJdbcResultSet.java
+++ b/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestJdbcResultSet.java
@@ -112,7 +112,7 @@ public void testObjectTypes()
         checkRepresentation("0.0E0 / 0.0E0", Types.DOUBLE, Double.NaN);
         checkRepresentation("0.1", Types.DECIMAL, new BigDecimal("0.1"));
         checkRepresentation("true", Types.BOOLEAN, true);
-        checkRepresentation("'hello'", Types.LONGNVARCHAR, "hello");
+        checkRepresentation("'hello'", Types.VARCHAR, "hello");
         checkRepresentation("cast('foo' as char(5))", Types.CHAR, "foo  ");
         checkRepresentation("ARRAY[1, 2]", Types.ARRAY, (rs, column) -> assertEquals(rs.getArray(column).getArray(), new int[] {1, 2}));
         checkRepresentation("DECIMAL '0.1'", Types.DECIMAL, new BigDecimal("0.1"));
diff --git a/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestPrestoDriver.java b/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestPrestoDriver.java
index 299b095d5e72..483b09e5df23 100644
--- a/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestPrestoDriver.java
+++ b/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestPrestoDriver.java
@@ -187,7 +187,7 @@ public void testDriverManager()
                     assertEquals(metadata.getColumnType(2), Types.BIGINT);
 
                     assertEquals(metadata.getColumnLabel(3), "_varchar");
-                    assertEquals(metadata.getColumnType(3), Types.LONGNVARCHAR);
+                    assertEquals(metadata.getColumnType(3), Types.VARCHAR);
 
                     assertEquals(metadata.getColumnLabel(4), "_double");
                     assertEquals(metadata.getColumnType(4), Types.DOUBLE);
@@ -196,7 +196,7 @@ public void testDriverManager()
                     assertEquals(metadata.getColumnType(5), Types.BOOLEAN);
 
                     assertEquals(metadata.getColumnLabel(6), "_varbinary");
-                    assertEquals(metadata.getColumnType(6), Types.LONGVARBINARY);
+                    assertEquals(metadata.getColumnType(6), Types.VARBINARY);
 
                     assertEquals(metadata.getColumnLabel(7), "_decimal_short");
                     assertEquals(metadata.getColumnType(7), Types.DECIMAL);
@@ -381,7 +381,7 @@ public void testGetCatalogs()
                 ResultSetMetaData metadata = rs.getMetaData();
                 assertEquals(metadata.getColumnCount(), 1);
                 assertEquals(metadata.getColumnLabel(1), "TABLE_CAT");
-                assertEquals(metadata.getColumnType(1), Types.LONGNVARCHAR);
+                assertEquals(metadata.getColumnType(1), Types.VARCHAR);
             }
         }
     }
@@ -514,10 +514,10 @@ private static void assertGetSchemasResult(ResultSet rs, List<List<String>> expe
         assertEquals(metadata.getColumnCount(), 2);
 
         assertEquals(metadata.getColumnLabel(1), "TABLE_SCHEM");
-        assertEquals(metadata.getColumnType(1), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(1), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(2), "TABLE_CATALOG");
-        assertEquals(metadata.getColumnType(2), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(2), Types.VARCHAR);
     }
 
     @Test
@@ -703,34 +703,34 @@ private static void assertTableMetadata(ResultSet rs)
         assertEquals(metadata.getColumnCount(), 10);
 
         assertEquals(metadata.getColumnLabel(1), "TABLE_CAT");
-        assertEquals(metadata.getColumnType(1), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(1), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(2), "TABLE_SCHEM");
-        assertEquals(metadata.getColumnType(2), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(2), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(3), "TABLE_NAME");
-        assertEquals(metadata.getColumnType(3), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(3), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(4), "TABLE_TYPE");
-        assertEquals(metadata.getColumnType(4), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(4), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(5), "REMARKS");
-        assertEquals(metadata.getColumnType(5), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(5), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(6), "TYPE_CAT");
-        assertEquals(metadata.getColumnType(6), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(6), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(7), "TYPE_SCHEM");
-        assertEquals(metadata.getColumnType(7), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(7), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(8), "TYPE_NAME");
-        assertEquals(metadata.getColumnType(8), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(8), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(9), "SELF_REFERENCING_COL_NAME");
-        assertEquals(metadata.getColumnType(9), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(9), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(10), "REF_GENERATION");
-        assertEquals(metadata.getColumnType(10), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(10), Types.VARCHAR);
     }
 
     @Test
@@ -746,7 +746,7 @@ public void testGetTableTypes()
                 assertEquals(metadata.getColumnCount(), 1);
 
                 assertEquals(metadata.getColumnLabel(1), "TABLE_TYPE");
-                assertEquals(metadata.getColumnType(1), Types.LONGNVARCHAR);
+                assertEquals(metadata.getColumnType(1), Types.VARCHAR);
             }
         }
     }
@@ -763,7 +763,7 @@ public void testGetColumns()
                 assertEquals(rs.getString("TABLE_SCHEM"), "information_schema");
                 assertEquals(rs.getString("TABLE_NAME"), "tables");
                 assertEquals(rs.getString("COLUMN_NAME"), "table_name");
-                assertEquals(rs.getInt("DATA_TYPE"), Types.LONGNVARCHAR);
+                assertEquals(rs.getInt("DATA_TYPE"), Types.VARCHAR);
                 assertTrue(rs.next());
                 assertEquals(rs.getString("TABLE_CAT"), "system");
                 assertEquals(rs.getString("TABLE_SCHEM"), "information_schema");
@@ -858,10 +858,10 @@ public void testGetColumns()
                 assertColumnSpec(rs, Types.TINYINT, 3L, 10L, null, null, TinyintType.TINYINT);
                 assertColumnSpec(rs, Types.REAL, 24L, 2L, null, null, RealType.REAL);
                 assertColumnSpec(rs, Types.DOUBLE, 53L, 2L, null, null, DoubleType.DOUBLE);
-                assertColumnSpec(rs, Types.LONGNVARCHAR, 1234L, null, null, 1234L, createVarcharType(1234));
-                assertColumnSpec(rs, Types.LONGNVARCHAR, (long) Integer.MAX_VALUE, null, null, (long) Integer.MAX_VALUE, createUnboundedVarcharType());
+                assertColumnSpec(rs, Types.VARCHAR, 1234L, null, null, 1234L, createVarcharType(1234));
+                assertColumnSpec(rs, Types.VARCHAR, (long) Integer.MAX_VALUE, null, null, (long) Integer.MAX_VALUE, createUnboundedVarcharType());
                 assertColumnSpec(rs, Types.CHAR, 345L, null, null, 345L, createCharType(345));
-                assertColumnSpec(rs, Types.LONGVARBINARY, (long) Integer.MAX_VALUE, null, null, (long) Integer.MAX_VALUE, VarbinaryType.VARBINARY);
+                assertColumnSpec(rs, Types.VARBINARY, (long) Integer.MAX_VALUE, null, null, (long) Integer.MAX_VALUE, VarbinaryType.VARBINARY);
                 assertColumnSpec(rs, Types.TIME, 8L, null, null, null, TimeType.TIME);
                 assertColumnSpec(rs, Types.TIME_WITH_TIMEZONE, 14L, null, null, null, TimeWithTimeZoneType.TIME_WITH_TIME_ZONE);
                 assertColumnSpec(rs, Types.TIMESTAMP, 23L, null, null, null, TimestampType.TIMESTAMP);
@@ -895,22 +895,22 @@ private static void assertColumnMetadata(ResultSet rs)
         assertEquals(metadata.getColumnCount(), 24);
 
         assertEquals(metadata.getColumnLabel(1), "TABLE_CAT");
-        assertEquals(metadata.getColumnType(1), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(1), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(2), "TABLE_SCHEM");
-        assertEquals(metadata.getColumnType(2), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(2), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(3), "TABLE_NAME");
-        assertEquals(metadata.getColumnType(3), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(3), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(4), "COLUMN_NAME");
-        assertEquals(metadata.getColumnType(4), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(4), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(5), "DATA_TYPE");
         assertEquals(metadata.getColumnType(5), Types.BIGINT);
 
         assertEquals(metadata.getColumnLabel(6), "TYPE_NAME");
-        assertEquals(metadata.getColumnType(6), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(6), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(7), "COLUMN_SIZE");
         assertEquals(metadata.getColumnType(7), Types.BIGINT);
@@ -928,10 +928,10 @@ private static void assertColumnMetadata(ResultSet rs)
         assertEquals(metadata.getColumnType(11), Types.BIGINT);
 
         assertEquals(metadata.getColumnLabel(12), "REMARKS");
-        assertEquals(metadata.getColumnType(12), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(12), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(13), "COLUMN_DEF");
-        assertEquals(metadata.getColumnType(13), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(13), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(14), "SQL_DATA_TYPE");
         assertEquals(metadata.getColumnType(14), Types.BIGINT);
@@ -946,25 +946,25 @@ private static void assertColumnMetadata(ResultSet rs)
         assertEquals(metadata.getColumnType(17), Types.BIGINT);
 
         assertEquals(metadata.getColumnLabel(18), "IS_NULLABLE");
-        assertEquals(metadata.getColumnType(18), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(18), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(19), "SCOPE_CATALOG");
-        assertEquals(metadata.getColumnType(19), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(19), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(20), "SCOPE_SCHEMA");
-        assertEquals(metadata.getColumnType(20), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(20), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(21), "SCOPE_TABLE");
-        assertEquals(metadata.getColumnType(21), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(21), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(22), "SOURCE_DATA_TYPE");
         assertEquals(metadata.getColumnType(22), Types.BIGINT);
 
         assertEquals(metadata.getColumnLabel(23), "IS_AUTOINCREMENT");
-        assertEquals(metadata.getColumnType(23), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(23), Types.VARCHAR);
 
         assertEquals(metadata.getColumnLabel(24), "IS_GENERATEDCOLUMN");
-        assertEquals(metadata.getColumnType(24), Types.LONGNVARCHAR);
+        assertEquals(metadata.getColumnType(24), Types.VARCHAR);
     }
 
     @Test
diff --git a/presto-main/src/main/java/com/facebook/presto/connector/system/jdbc/ColumnJdbcTable.java b/presto-main/src/main/java/com/facebook/presto/connector/system/jdbc/ColumnJdbcTable.java
index a4363f46b26f..8780d88abf7a 100644
--- a/presto-main/src/main/java/com/facebook/presto/connector/system/jdbc/ColumnJdbcTable.java
+++ b/presto-main/src/main/java/com/facebook/presto/connector/system/jdbc/ColumnJdbcTable.java
@@ -193,13 +193,13 @@ static int jdbcDataType(Type type)
             return Types.DECIMAL;
         }
         if (isVarcharType(type)) {
-            return Types.LONGNVARCHAR;
+            return Types.VARCHAR;
         }
         if (isCharType(type)) {
             return Types.CHAR;
         }
         if (type.equals(VARBINARY)) {
-            return Types.LONGVARBINARY;
+            return Types.VARBINARY;
         }
         if (type.equals(TIME)) {
             return Types.TIME;
diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/JmxConnectorTests.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/JmxConnectorTests.java
index cf8ccc6f8fec..7f641350734b 100644
--- a/presto-product-tests/src/main/java/com/facebook/presto/tests/JmxConnectorTests.java
+++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/JmxConnectorTests.java
@@ -16,17 +16,11 @@
 import io.prestodb.tempto.ProductTest;
 import org.testng.annotations.Test;
 
-import java.sql.Connection;
-
 import static com.facebook.presto.tests.TestGroups.JDBC;
 import static com.facebook.presto.tests.TestGroups.JMX_CONNECTOR;
-import static com.facebook.presto.tests.utils.JdbcDriverUtils.usingPrestoJdbcDriver;
-import static com.facebook.presto.tests.utils.JdbcDriverUtils.usingTeradataJdbcDriver;
 import static io.prestodb.tempto.assertions.QueryAssert.assertThat;
-import static io.prestodb.tempto.query.QueryExecutor.defaultQueryExecutor;
 import static io.prestodb.tempto.query.QueryExecutor.query;
 import static java.sql.JDBCType.BIGINT;
-import static java.sql.JDBCType.LONGNVARCHAR;
 import static java.sql.JDBCType.VARCHAR;
 
 public class JmxConnectorTests
@@ -35,22 +29,10 @@ public class JmxConnectorTests
     @Test(groups = {JMX_CONNECTOR, JDBC})
     public void selectFromJavaRuntimeJmxMBean()
     {
-        Connection connection = defaultQueryExecutor().getConnection();
         String sql = "SELECT node, vmname, vmversion FROM jmx.current.\"java.lang:type=runtime\"";
-
-        if (usingPrestoJdbcDriver(connection)) {
-            assertThat(query(sql))
-                    .hasColumns(LONGNVARCHAR, LONGNVARCHAR, LONGNVARCHAR)
-                    .hasAnyRows();
-        }
-        else if (usingTeradataJdbcDriver(connection)) {
-            assertThat(query(sql))
-                    .hasColumns(VARCHAR, VARCHAR, VARCHAR)
-                    .hasAnyRows();
-        }
-        else {
-            throw new IllegalStateException();
-        }
+        assertThat(query(sql))
+                .hasColumns(VARCHAR, VARCHAR, VARCHAR)
+                .hasAnyRows();
     }
 
     @Test(groups = JMX_CONNECTOR)
diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/SystemConnectorTests.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/SystemConnectorTests.java
index aa244b258ebe..a102fdbe3182 100644
--- a/presto-product-tests/src/main/java/com/facebook/presto/tests/SystemConnectorTests.java
+++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/SystemConnectorTests.java
@@ -16,17 +16,11 @@
 import io.prestodb.tempto.ProductTest;
 import org.testng.annotations.Test;
 
-import java.sql.Connection;
-
 import static com.facebook.presto.tests.TestGroups.JDBC;
 import static com.facebook.presto.tests.TestGroups.SYSTEM_CONNECTOR;
-import static com.facebook.presto.tests.utils.JdbcDriverUtils.usingPrestoJdbcDriver;
-import static com.facebook.presto.tests.utils.JdbcDriverUtils.usingTeradataJdbcDriver;
 import static io.prestodb.tempto.assertions.QueryAssert.assertThat;
-import static io.prestodb.tempto.query.QueryExecutor.defaultQueryExecutor;
 import static io.prestodb.tempto.query.QueryExecutor.query;
 import static java.sql.JDBCType.BIGINT;
-import static java.sql.JDBCType.LONGNVARCHAR;
 import static java.sql.JDBCType.TIMESTAMP;
 import static java.sql.JDBCType.VARCHAR;
 
@@ -36,27 +30,15 @@ public class SystemConnectorTests
     @Test(groups = {SYSTEM_CONNECTOR, JDBC})
     public void selectRuntimeNodes()
     {
-        Connection connection = defaultQueryExecutor().getConnection();
         String sql = "SELECT node_id, http_uri, node_version, state FROM system.runtime.nodes";
-        if (usingPrestoJdbcDriver(connection)) {
-            assertThat(query(sql))
-                    .hasColumns(LONGNVARCHAR, LONGNVARCHAR, LONGNVARCHAR, LONGNVARCHAR)
-                    .hasAnyRows();
-        }
-        else if (usingTeradataJdbcDriver(connection)) {
-            assertThat(query(sql))
-                    .hasColumns(VARCHAR, VARCHAR, VARCHAR, VARCHAR)
-                    .hasAnyRows();
-        }
-        else {
-            throw new IllegalStateException();
-        }
+        assertThat(query(sql))
+                .hasColumns(VARCHAR, VARCHAR, VARCHAR, VARCHAR)
+                .hasAnyRows();
     }
 
     @Test(groups = {SYSTEM_CONNECTOR, JDBC})
     public void selectRuntimeQueries()
     {
-        Connection connection = defaultQueryExecutor().getConnection();
         String sql = "SELECT" +
                 "  node_id," +
                 "  query_id," +
@@ -71,27 +53,15 @@ public void selectRuntimeQueries()
                 "  last_heartbeat," +
                 "  'end' " +
                 "FROM system.runtime.queries";
-        if (usingPrestoJdbcDriver(connection)) {
-            assertThat(query(sql))
-                    .hasColumns(LONGNVARCHAR, LONGNVARCHAR, LONGNVARCHAR, LONGNVARCHAR, LONGNVARCHAR,
-                            BIGINT, BIGINT, BIGINT, TIMESTAMP, TIMESTAMP, TIMESTAMP, LONGNVARCHAR)
-                    .hasAnyRows();
-        }
-        else if (usingTeradataJdbcDriver(connection)) {
-            assertThat(query(sql))
-                    .hasColumns(VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR,
-                            BIGINT, BIGINT, BIGINT, TIMESTAMP, TIMESTAMP, TIMESTAMP, VARCHAR)
-                    .hasAnyRows();
-        }
-        else {
-            throw new IllegalStateException();
-        }
+        assertThat(query(sql))
+                .hasColumns(VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR,
+                        BIGINT, BIGINT, BIGINT, TIMESTAMP, TIMESTAMP, TIMESTAMP, VARCHAR)
+                .hasAnyRows();
     }
 
     @Test(groups = {SYSTEM_CONNECTOR, JDBC})
     public void selectRuntimeTasks()
     {
-        Connection connection = defaultQueryExecutor().getConnection();
         String sql = "SELECT" +
                 "  node_id," +
                 "  task_id," +
@@ -118,43 +88,19 @@ public void selectRuntimeTasks()
                 "  last_heartbeat," +
                 "  'end' " +
                 "FROM SYSTEM.runtime.tasks";
-        if (usingPrestoJdbcDriver(connection)) {
-            assertThat(query(sql))
-                    .hasColumns(LONGNVARCHAR, LONGNVARCHAR, LONGNVARCHAR, LONGNVARCHAR, LONGNVARCHAR,
-                            BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, BIGINT,
-                            BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, TIMESTAMP, TIMESTAMP, TIMESTAMP, LONGNVARCHAR)
-                    .hasAnyRows();
-        }
-        else if (usingTeradataJdbcDriver(connection)) {
-            assertThat(query(sql))
-                    .hasColumns(VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR,
-                            BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, BIGINT,
-                            BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, TIMESTAMP, TIMESTAMP, TIMESTAMP, VARCHAR)
-                    .hasAnyRows();
-        }
-        else {
-            throw new IllegalStateException();
-        }
+        assertThat(query(sql))
+                .hasColumns(VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR,
+                        BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, BIGINT,
+                        BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, BIGINT, TIMESTAMP, TIMESTAMP, TIMESTAMP, VARCHAR)
+                .hasAnyRows();
     }
 
     @Test(groups = {SYSTEM_CONNECTOR, JDBC})
     public void selectMetadataCatalogs()
     {
-        Connection connection = defaultQueryExecutor().getConnection();
         String sql = "select catalog_name, connector_id from system.metadata.catalogs";
-
-        if (usingPrestoJdbcDriver(connection)) {
-            assertThat(query(sql))
-                    .hasColumns(LONGNVARCHAR, LONGNVARCHAR)
-                    .hasAnyRows();
-        }
-        else if (usingTeradataJdbcDriver(connection)) {
-            assertThat(query(sql))
-                    .hasColumns(VARCHAR, VARCHAR)
-                    .hasAnyRows();
-        }
-        else {
-            throw new IllegalStateException();
-        }
+        assertThat(query(sql))
+                .hasColumns(VARCHAR, VARCHAR)
+                .hasAnyRows();
     }
 }
diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/cassandra/TestSelect.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/cassandra/TestSelect.java
index 139364f5f499..f272b8144d4d 100644
--- a/presto-product-tests/src/main/java/com/facebook/presto/tests/cassandra/TestSelect.java
+++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/cassandra/TestSelect.java
@@ -44,10 +44,10 @@
 import static java.sql.JDBCType.BOOLEAN;
 import static java.sql.JDBCType.DOUBLE;
 import static java.sql.JDBCType.INTEGER;
-import static java.sql.JDBCType.LONGNVARCHAR;
-import static java.sql.JDBCType.LONGVARBINARY;
 import static java.sql.JDBCType.REAL;
 import static java.sql.JDBCType.TIMESTAMP;
+import static java.sql.JDBCType.VARBINARY;
+import static java.sql.JDBCType.VARCHAR;
 import static java.util.concurrent.TimeUnit.MINUTES;
 
 public class TestSelect
@@ -173,9 +173,9 @@ public void testAllDataTypes()
                 CONNECTOR_NAME, KEY_SPACE, CASSANDRA_ALL_TYPES.getName()));
 
         assertThat(query)
-                .hasColumns(LONGNVARCHAR, BIGINT, LONGVARBINARY, BOOLEAN, DOUBLE, DOUBLE, REAL, LONGNVARCHAR, LONGNVARCHAR,
-                        INTEGER, LONGNVARCHAR, LONGNVARCHAR, LONGNVARCHAR, LONGNVARCHAR, TIMESTAMP, LONGNVARCHAR, LONGNVARCHAR,
-                        LONGNVARCHAR, LONGNVARCHAR)
+                .hasColumns(VARCHAR, BIGINT, VARBINARY, BOOLEAN, DOUBLE, DOUBLE, REAL, VARCHAR, VARCHAR,
+                        INTEGER, VARCHAR, VARCHAR, VARCHAR, VARCHAR, TIMESTAMP, VARCHAR, VARCHAR,
+                        VARCHAR, VARCHAR)
                 .containsOnly(
                         row("\0", Long.MIN_VALUE, Bytes.fromHexString("0x00").array(), false, 0f, Double.MIN_VALUE,
                                 Float.MIN_VALUE, "[0]", "0.0.0.0", Integer.MIN_VALUE, "[0]", "{\"\\u0000\":-2147483648,\"a\":0}",
@@ -254,9 +254,9 @@ public void testSelectAllTypePartitioningMaterializedView()
                 CONNECTOR_NAME, KEY_SPACE, materializedViewName));
 
         assertThat(query)
-                .hasColumns(LONGNVARCHAR, BIGINT, LONGVARBINARY, BOOLEAN, DOUBLE, DOUBLE, REAL, LONGNVARCHAR, LONGNVARCHAR,
-                        INTEGER, LONGNVARCHAR, LONGNVARCHAR, LONGNVARCHAR, LONGNVARCHAR, TIMESTAMP, LONGNVARCHAR, LONGNVARCHAR,
-                        LONGNVARCHAR, LONGNVARCHAR)
+                .hasColumns(VARCHAR, BIGINT, VARBINARY, BOOLEAN, DOUBLE, DOUBLE, REAL, VARCHAR, VARCHAR,
+                        INTEGER, VARCHAR, VARCHAR, VARCHAR, VARCHAR, TIMESTAMP, VARCHAR, VARCHAR,
+                        VARCHAR, VARCHAR)
                 .containsOnly(
                         row("\0", Long.MIN_VALUE, Bytes.fromHexString("0x00").array(), false, 0f, Double.MIN_VALUE,
                                 Float.MIN_VALUE, "[0]", "0.0.0.0", Integer.MIN_VALUE, "[0]", "{\"\\u0000\":-2147483648,\"a\":0}",
diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestAllDatatypesFromHiveConnector.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestAllDatatypesFromHiveConnector.java
index 0c8d75c6bbaf..858d70f63d30 100644
--- a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestAllDatatypesFromHiveConnector.java
+++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestAllDatatypesFromHiveConnector.java
@@ -28,7 +28,6 @@
 import org.testng.annotations.Test;
 
 import java.math.BigDecimal;
-import java.sql.Connection;
 import java.sql.Date;
 
 import static com.facebook.presto.tests.TemptoProductTestRunner.PRODUCT_TESTS_TIME_ZONE;
@@ -44,15 +43,12 @@
 import static com.facebook.presto.tests.hive.AllSimpleTypesTableDefinitions.ALL_HIVE_SIMPLE_TYPES_TEXTFILE;
 import static com.facebook.presto.tests.hive.AllSimpleTypesTableDefinitions.onHive;
 import static com.facebook.presto.tests.hive.AllSimpleTypesTableDefinitions.populateDataToHiveTable;
-import static com.facebook.presto.tests.utils.JdbcDriverUtils.usingPrestoJdbcDriver;
-import static com.facebook.presto.tests.utils.JdbcDriverUtils.usingTeradataJdbcDriver;
 import static io.prestodb.tempto.assertions.QueryAssert.Row.row;
 import static io.prestodb.tempto.assertions.QueryAssert.assertThat;
 import static io.prestodb.tempto.context.ThreadLocalTestContextHolder.testContext;
 import static io.prestodb.tempto.fulfillment.table.MutableTableRequirement.State.CREATED;
 import static io.prestodb.tempto.fulfillment.table.TableHandle.tableHandle;
 import static io.prestodb.tempto.fulfillment.table.TableRequirements.immutableTable;
-import static io.prestodb.tempto.query.QueryExecutor.defaultQueryExecutor;
 import static io.prestodb.tempto.query.QueryExecutor.query;
 import static io.prestodb.tempto.util.DateTimeUtils.parseTimestampInLocalTime;
 import static java.lang.String.format;
@@ -63,8 +59,6 @@
 import static java.sql.JDBCType.DECIMAL;
 import static java.sql.JDBCType.DOUBLE;
 import static java.sql.JDBCType.INTEGER;
-import static java.sql.JDBCType.LONGNVARCHAR;
-import static java.sql.JDBCType.LONGVARBINARY;
 import static java.sql.JDBCType.REAL;
 import static java.sql.JDBCType.SMALLINT;
 import static java.sql.JDBCType.TIMESTAMP;
@@ -229,20 +223,20 @@ public void testSelectAllDatatypesAvro()
         String tableName = mutableTableInstanceOf(ALL_HIVE_SIMPLE_TYPES_AVRO).getNameInDatabase();
 
         onHive().executeQuery(format("INSERT INTO %s VALUES(" +
-                "2147483647," +
-                "9223372036854775807," +
-                "123.345," +
-                "234.567," +
-                "346," +
-                "345.67800," +
-                "'" + parseTimestampInLocalTime("2015-05-10 12:15:35.123", PRODUCT_TESTS_TIME_ZONE).toString() + "'," +
-                "'" + Date.valueOf("2015-05-10") + "'," +
-                "'ala ma kota'," +
-                "'ala ma kot'," +
-                "'ala ma    '," +
-                "true," +
-                "'kot binarny'" +
-                ")",
+                        "2147483647," +
+                        "9223372036854775807," +
+                        "123.345," +
+                        "234.567," +
+                        "346," +
+                        "345.67800," +
+                        "'" + parseTimestampInLocalTime("2015-05-10 12:15:35.123", PRODUCT_TESTS_TIME_ZONE).toString() + "'," +
+                        "'" + Date.valueOf("2015-05-10") + "'," +
+                        "'ala ma kota'," +
+                        "'ala ma kot'," +
+                        "'ala ma    '," +
+                        "true," +
+                        "'kot binarny'" +
+                        ")",
                 tableName));
 
         assertThat(query("SHOW COLUMNS FROM " + tableName).project(1, 2)).containsExactly(
@@ -261,39 +255,20 @@ public void testSelectAllDatatypesAvro()
                 row("c_binary", "varbinary"));
 
         QueryResult queryResult = query("SELECT * FROM " + tableName);
-        Connection connection = defaultQueryExecutor().getConnection();
-        if (usingPrestoJdbcDriver(connection)) {
-            assertThat(queryResult).hasColumns(
-                    INTEGER,
-                    BIGINT,
-                    REAL,
-                    DOUBLE,
-                    DECIMAL,
-                    DECIMAL,
-                    TIMESTAMP,
-                    DATE,
-                    LONGNVARCHAR,
-                    LONGNVARCHAR,
-                    CHAR,
-                    BOOLEAN,
-                    LONGVARBINARY);
-        }
-        else if (usingTeradataJdbcDriver(connection)) {
-            assertThat(queryResult).hasColumns(
-                    INTEGER,
-                    BIGINT,
-                    REAL,
-                    DOUBLE,
-                    DECIMAL,
-                    DECIMAL,
-                    TIMESTAMP,
-                    DATE,
-                    VARCHAR,
-                    VARCHAR,
-                    CHAR,
-                    BOOLEAN,
-                    VARBINARY);
-        }
+        assertThat(queryResult).hasColumns(
+                INTEGER,
+                BIGINT,
+                REAL,
+                DOUBLE,
+                DECIMAL,
+                DECIMAL,
+                TIMESTAMP,
+                DATE,
+                VARCHAR,
+                VARCHAR,
+                CHAR,
+                BOOLEAN,
+                VARBINARY);
 
         assertThat(queryResult).containsOnly(
                 row(
@@ -334,88 +309,41 @@ private void assertProperAllDatatypesSchema(String tableName)
 
     private void assertColumnTypes(QueryResult queryResult)
     {
-        Connection connection = defaultQueryExecutor().getConnection();
-        if (usingPrestoJdbcDriver(connection)) {
-            assertThat(queryResult).hasColumns(
-                    TINYINT,
-                    SMALLINT,
-                    INTEGER,
-                    BIGINT,
-                    REAL,
-                    DOUBLE,
-                    DECIMAL,
-                    DECIMAL,
-                    TIMESTAMP,
-                    DATE,
-                    LONGNVARCHAR,
-                    LONGNVARCHAR,
-                    CHAR,
-                    BOOLEAN,
-                    LONGVARBINARY);
-        }
-        else if (usingTeradataJdbcDriver(connection)) {
-            assertThat(queryResult).hasColumns(
-                    TINYINT,
-                    SMALLINT,
-                    INTEGER,
-                    BIGINT,
-                    REAL,
-                    DOUBLE,
-                    DECIMAL,
-                    DECIMAL,
-                    TIMESTAMP,
-                    DATE,
-                    VARCHAR,
-                    VARCHAR,
-                    CHAR,
-                    BOOLEAN,
-                    VARBINARY);
-        }
-        else {
-            throw new IllegalStateException();
-        }
+        assertThat(queryResult).hasColumns(
+                TINYINT,
+                SMALLINT,
+                INTEGER,
+                BIGINT,
+                REAL,
+                DOUBLE,
+                DECIMAL,
+                DECIMAL,
+                TIMESTAMP,
+                DATE,
+                VARCHAR,
+                VARCHAR,
+                CHAR,
+                BOOLEAN,
+                VARBINARY);
     }
 
     private void assertColumnTypesParquet(QueryResult queryResult)
     {
-        Connection connection = defaultQueryExecutor().getConnection();
-        if (usingPrestoJdbcDriver(connection)) {
-            assertThat(queryResult).hasColumns(
-                    TINYINT,
-                    SMALLINT,
-                    INTEGER,
-                    BIGINT,
-                    REAL,
-                    DOUBLE,
-                    DECIMAL,
-                    DECIMAL,
-                    TIMESTAMP,
-                    LONGNVARCHAR,
-                    LONGNVARCHAR,
-                    CHAR,
-                    BOOLEAN,
-                    LONGVARBINARY);
-        }
-        else if (usingTeradataJdbcDriver(connection)) {
-            assertThat(queryResult).hasColumns(
-                    TINYINT,
-                    SMALLINT,
-                    INTEGER,
-                    BIGINT,
-                    REAL,
-                    DOUBLE,
-                    DECIMAL,
-                    DECIMAL,
-                    TIMESTAMP,
-                    VARCHAR,
-                    VARCHAR,
-                    CHAR,
-                    BOOLEAN,
-                    VARBINARY);
-        }
-        else {
-            throw new IllegalStateException();
-        }
+        assertThat(queryResult).hasColumns(
+                TINYINT,
+                SMALLINT,
+                INTEGER,
+                BIGINT,
+                REAL,
+                DOUBLE,
+                DECIMAL,
+                DECIMAL,
+                TIMESTAMP,
+                VARCHAR,
+                VARCHAR,
+                CHAR,
+                BOOLEAN,
+                VARBINARY);
     }
 
     @Requires(ParquetRequirements.class)
diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestHiveCoercion.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestHiveCoercion.java
index 94c49329b053..0d2b3e7204ae 100644
--- a/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestHiveCoercion.java
+++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/hive/TestHiveCoercion.java
@@ -32,7 +32,6 @@
 import io.prestodb.tempto.query.QueryResult;
 import org.testng.annotations.Test;
 
-import java.sql.Connection;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -43,8 +42,6 @@
 import static com.facebook.presto.tests.TestGroups.HIVE_COERCION;
 import static com.facebook.presto.tests.TestGroups.HIVE_CONNECTOR;
 import static com.facebook.presto.tests.TestGroups.JDBC;
-import static com.facebook.presto.tests.utils.JdbcDriverUtils.usingPrestoJdbcDriver;
-import static com.facebook.presto.tests.utils.JdbcDriverUtils.usingTeradataJdbcDriver;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.airlift.testing.Assertions.assertEqualsIgnoreOrder;
 import static io.prestodb.tempto.assertions.QueryAssert.Row.row;
@@ -52,7 +49,6 @@
 import static io.prestodb.tempto.context.ThreadLocalTestContextHolder.testContext;
 import static io.prestodb.tempto.fulfillment.table.MutableTableRequirement.State.CREATED;
 import static io.prestodb.tempto.fulfillment.table.TableHandle.tableHandle;
-import static io.prestodb.tempto.query.QueryExecutor.defaultQueryExecutor;
 import static io.prestodb.tempto.query.QueryExecutor.query;
 import static java.lang.String.format;
 import static java.sql.JDBCType.ARRAY;
@@ -60,7 +56,6 @@
 import static java.sql.JDBCType.DOUBLE;
 import static java.sql.JDBCType.INTEGER;
 import static java.sql.JDBCType.JAVA_OBJECT;
-import static java.sql.JDBCType.LONGNVARCHAR;
 import static java.sql.JDBCType.SMALLINT;
 import static java.sql.JDBCType.VARCHAR;
 import static java.util.stream.Collectors.toList;
@@ -337,40 +332,19 @@ private void assertProperAlteredTableSchema(String tableName)
 
     private void assertColumnTypes(QueryResult queryResult)
     {
-        Connection connection = defaultQueryExecutor().getConnection();
-        if (usingPrestoJdbcDriver(connection)) {
-            assertThat(queryResult).hasColumns(
-                    SMALLINT,
-                    INTEGER,
-                    BIGINT,
-                    INTEGER,
-                    BIGINT,
-                    BIGINT,
-                    LONGNVARCHAR,
-                    DOUBLE,
-                    JAVA_OBJECT,
-                    ARRAY,
-                    JAVA_OBJECT,
-                    BIGINT);
-        }
-        else if (usingTeradataJdbcDriver(connection)) {
-            assertThat(queryResult).hasColumns(
-                    SMALLINT,
-                    INTEGER,
-                    BIGINT,
-                    INTEGER,
-                    BIGINT,
-                    BIGINT,
-                    VARCHAR,
-                    DOUBLE,
-                    JAVA_OBJECT,
-                    ARRAY,
-                    JAVA_OBJECT,
-                    BIGINT);
-        }
-        else {
-            throw new IllegalStateException();
-        }
+        assertThat(queryResult).hasColumns(
+                SMALLINT,
+                INTEGER,
+                BIGINT,
+                INTEGER,
+                BIGINT,
+                BIGINT,
+                VARCHAR,
+                DOUBLE,
+                JAVA_OBJECT,
+                ARRAY,
+                JAVA_OBJECT,
+                BIGINT);
     }
 
     private static void alterTableColumnTypes(String tableName)
diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/sqlserver/TestSelect.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/sqlserver/TestSelect.java
index 526a9af31897..b69a8ed01d1b 100644
--- a/presto-product-tests/src/main/java/com/facebook/presto/tests/sqlserver/TestSelect.java
+++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/sqlserver/TestSelect.java
@@ -45,11 +45,11 @@
 import static java.sql.JDBCType.DATE;
 import static java.sql.JDBCType.DOUBLE;
 import static java.sql.JDBCType.INTEGER;
-import static java.sql.JDBCType.LONGNVARCHAR;
 import static java.sql.JDBCType.REAL;
 import static java.sql.JDBCType.SMALLINT;
 import static java.sql.JDBCType.TIMESTAMP;
 import static java.sql.JDBCType.TINYINT;
+import static java.sql.JDBCType.VARCHAR;
 
 public class TestSelect
         extends ProductTest
@@ -136,8 +136,8 @@ public void testAllDatatypes()
                 .executeQuery(sql);
 
         assertThat(queryResult)
-                .hasColumns(BIGINT, SMALLINT, INTEGER, TINYINT, DOUBLE, REAL, CHAR, LONGNVARCHAR, LONGNVARCHAR,
-                        CHAR, LONGNVARCHAR, LONGNVARCHAR, DATE, TIMESTAMP, TIMESTAMP, TIMESTAMP, DOUBLE, REAL)
+                .hasColumns(BIGINT, SMALLINT, INTEGER, TINYINT, DOUBLE, REAL, CHAR, VARCHAR, VARCHAR,
+                        CHAR, VARCHAR, VARCHAR, DATE, TIMESTAMP, TIMESTAMP, TIMESTAMP, DOUBLE, REAL)
                 .containsOnly(
                         row(Long.MIN_VALUE, Short.MIN_VALUE, Integer.MIN_VALUE, Byte.MIN_VALUE, Double.MIN_VALUE,
                                 Float.valueOf("-3.40E+38"), "\0   ", "\0", "\0", "\0    ", "\0", "\0",
diff --git a/presto-product-tests/src/main/resources/com/facebook/presto/tests/jdbc/get_nation_columns.result b/presto-product-tests/src/main/resources/com/facebook/presto/tests/jdbc/get_nation_columns.result
index 56550ee76bae..4ac132a2ccf2 100644
--- a/presto-product-tests/src/main/resources/com/facebook/presto/tests/jdbc/get_nation_columns.result
+++ b/presto-product-tests/src/main/resources/com/facebook/presto/tests/jdbc/get_nation_columns.result
@@ -1,5 +1,5 @@
--- delimiter: |; ignoreOrder: false; ignoreExcessRows: false; 
+-- delimiter: |; ignoreOrder: false; ignoreExcessRows: false;
 hive|default|nation|n_nationkey|-5|bigint|19|0|null|10|2|null|null|null|null|null|1||null|null|null|null|null|null|
-hive|default|nation|n_name|-16|varchar(25)|25|0|null|null|2|null|null|null|null|25|2||null|null|null|null|null|null|
+hive|default|nation|n_name|12|varchar(25)|25|0|null|null|2|null|null|null|null|25|2||null|null|null|null|null|null|
 hive|default|nation|n_regionkey|-5|bigint|19|0|null|10|2|null|null|null|null|null|3||null|null|null|null|null|null|
-hive|default|nation|n_comment|-16|varchar(152)|152|0|null|null|2|null|null|null|null|152|4||null|null|null|null|null|null|
+hive|default|nation|n_comment|12|varchar(152)|152|0|null|null|2|null|null|null|null|152|4||null|null|null|null|null|null|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/group-by/runHavingWithMultipleAggs.result b/presto-product-tests/src/main/resources/sql-tests/testcases/group-by/runHavingWithMultipleAggs.result
index b3b24529626c..55588216deff 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/group-by/runHavingWithMultipleAggs.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/group-by/runHavingWithMultipleAggs.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|BIGINT; ignoreOrder: true
+-- delimiter: |; types: VARCHAR|BIGINT; ignoreOrder: true
 STANDARD POLISHED TIN|1298|
 STANDARD PLATED BRASS|1362|
 LARGE BRUSHED TIN|1328|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q02.result b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q02.result
index af4089ddd4f3..85b277c89512 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q02.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q02.result
@@ -1,4 +1,4 @@
--- delimiter: |; ignoreOrder: false; types: DECIMAL|LONGNVARCHAR|LONGNVARCHAR|BIGINT|LONGNVARCHAR|LONGNVARCHAR|LONGNVARCHAR|LONGNVARCHAR
+-- delimiter: |; ignoreOrder: false; types: DECIMAL|VARCHAR|VARCHAR|BIGINT|VARCHAR|VARCHAR|VARCHAR|VARCHAR
 9938.53000000000|Supplier#000005359|UNITED KINGDOM|185358|Manufacturer#4|QKuHYh,vZGiwu2FWEJoLDx04|33-429-790-6131|uriously regular requests hag|
 9937.84000000000|Supplier#000005969|ROMANIA|108438|Manufacturer#1|ANDENSOSmk,miq23Xfb5RWt6dvUcvt6Qa|29-520-692-3537|efully express instructions. regular requests against the slyly fin|
 9936.22000000000|Supplier#000005250|UNITED KINGDOM|249|Manufacturer#4|B3rqp0xbSEim4Mpy2RH J|33-320-228-2957|etect about the furiously final accounts. slyly ironic pinto beans sleep inside the furiously|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q04.result b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q04.result
index bb671989b7c4..3254d7162271 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q04.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q04.result
@@ -1,4 +1,4 @@
--- delimiter: |; ignoreOrder: false; types: LONGNVARCHAR|BIGINT
+-- delimiter: |; ignoreOrder: false; types: VARCHAR|BIGINT
 1-URGENT|10594|
 2-HIGH|10476|
 3-MEDIUM|10410|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q10.result b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q10.result
index 0306ad1d69eb..48f8cd780693 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q10.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q10.result
@@ -1,4 +1,4 @@
--- delimiter: |; ignoreOrder: false; types: BIGINT|LONGNVARCHAR|DECIMAL|DECIMAL|LONGNVARCHAR|LONGNVARCHAR|LONGNVARCHAR|LONGNVARCHAR
+-- delimiter: |; ignoreOrder: false; types: BIGINT|VARCHAR|DECIMAL|DECIMAL|VARCHAR|VARCHAR|VARCHAR|VARCHAR
 57040|Customer#000057040|734235.2455|632.87|JAPAN|Eioyzjf4pp|22-895-641-3466|sits. slyly regular requests sleep alongside of the regular inst|
 143347|Customer#000143347|721002.6948|2557.47|EGYPT|1aReFYv,Kw4|14-742-935-3718|ggle carefully enticing requests. final deposits use bold, bold pinto beans. ironic, idle re|
 60838|Customer#000060838|679127.3077|2454.77|BRAZIL|64EaJ5vMAHWJlBOxJklpNc2RJiWE|12-913-494-9813| need to boost against the slyly regular account|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q15.result b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q15.result
index 0af7d95b272f..3aa49a99461a 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q15.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q15.result
@@ -1,2 +1,2 @@
--- delimiter: |; ignoreOrder: false; types: BIGINT|LONGNVARCHAR|LONGNVARCHAR|LONGNVARCHAR|DECIMAL
+-- delimiter: |; ignoreOrder: false; types: BIGINT|VARCHAR|VARCHAR|VARCHAR|DECIMAL
 8449|Supplier#000008449|Wp34zim9qYFbVctdW|20-469-856-8873|1772627.2087|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q18.result b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q18.result
index f0518df40dc7..6986e70bd9e4 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q18.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q18.result
@@ -1,4 +1,4 @@
--- delimiter: |; ignoreOrder: false; types: LONGNVARCHAR|BIGINT|BIGINT|DATE|DECIMAL|DECIMAL
+-- delimiter: |; ignoreOrder: false; types: VARCHAR|BIGINT|BIGINT|DATE|DECIMAL|DECIMAL
 Customer#000128120|128120|4722021|1994-04-07|544089.09|323|
 Customer#000144617|144617|3043270|1997-02-12|530604.44|317|
 Customer#000013940|13940|2232932|1997-04-13|522720.61|304|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q20.result b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q20.result
index 0e0fafc4922a..87fbac10f4cf 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q20.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q20.result
@@ -1,4 +1,4 @@
--- delimiter: |; ignoreOrder: false; types: LONGNVARCHAR|LONGNVARCHAR
+-- delimiter: |; ignoreOrder: false; types: VARCHAR|VARCHAR
 Supplier#000000020|iybAE,RmTymrZVYaFZva2SH,j|
 Supplier#000000091|YV45D7TkfdQanOOZ7q9QxkyGUapU1oOWU6q3|
 Supplier#000000205|rF uV8d0JNEk|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q21.result b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q21.result
index e44a2eaaf928..fd6108e71ab0 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q21.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q21.result
@@ -1,4 +1,4 @@
--- delimiter: |; ignoreOrder: false; types: LONGNVARCHAR|BIGINT
+-- delimiter: |; ignoreOrder: false; types: VARCHAR|BIGINT
 Supplier#000002829|20|
 Supplier#000005808|18|
 Supplier#000000262|17|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q22.result b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q22.result
index 4947dbdc7d49..f47019f8fc56 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q22.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/hive_tpch/q22.result
@@ -1,4 +1,4 @@
--- delimiter: |; ignoreOrder: false; types: LONGNVARCHAR|BIGINT|DECIMAL
+-- delimiter: |; ignoreOrder: false; types: VARCHAR|BIGINT|DECIMAL
 13|888|6737713.99|
 17|861|6460573.72|
 18|964|7236687.40|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q05.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q05.result
index 5e47bc1d0635..4360e308cc62 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q05.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q05.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|LONGNVARCHAR|DECIMAL|DECIMAL|DECIMAL
+-- delimiter: |; types: VARCHAR|VARCHAR|DECIMAL|DECIMAL|DECIMAL
 catalog channel|catalog_pageAAAAAAAAAAABAAAA|202313.40|16399.02|-47694.75|
 catalog channel|catalog_pageAAAAAAAAAACBAAAA|0.00|40.67|-580.23|
 catalog channel|catalog_pageAAAAAAAAABABAAAA|99963.73|0.00|-9123.42|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q08.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q08.result
index a954ca93ddff..5926c4e380b3 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q08.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q08.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|DECIMAL
+-- delimiter: |; types: VARCHAR|DECIMAL
 able|-9767751.88|
 ation|-10546549.93|
 bar|-10133672.06|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q11.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q11.result
index 1945c074a2f4..50ee49b27a87 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q11.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q11.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|CHAR|CHAR|CHAR|LONGNVARCHAR|CHAR
+-- delimiter: |; types: CHAR|CHAR|CHAR|CHAR|VARCHAR|CHAR
 AAAAAAAAAFGBBAAA|Howard              |Major                         |Y|BOUVET ISLAND|null|
 AAAAAAAAAMGDAAAA|Kenneth             |Harlan                        |Y|POLAND|null|
 AAAAAAAAAOPFBAAA|Jerry               |Fields                        |Y|SIERRA LEONE|null|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q12.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q12.result
index 097506033368..59562b3cc551 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q12.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q12.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|LONGNVARCHAR|CHAR|CHAR|DECIMAL|DECIMAL|DECIMAL
+-- delimiter: |; types: CHAR|VARCHAR|CHAR|CHAR|DECIMAL|DECIMAL|DECIMAL
 AAAAAAAAAAKAAAAA|Small, political activities help great, bad policies. Therefore square features provide on a machines. Rules make over me|Books                                             |arts                                              |2.42|2742.60|3.72|
 AAAAAAAABHDCAAAA|Minor heads close common children; recently strong firms provide. Useful, young men ought to create changes. Popular, common regulations might decide. Points fit. Obvious, glad officials |Books                                             |arts                                              |3.88|4258.84|5.77|
 AAAAAAAACKEAAAAA|Legs appear eventually soci|Books                                             |arts                                              |35.27|4010.65|5.44|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q14_1.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q14_1.result
index cbdee342e5d5..6658c8bf8a88 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q14_1.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q14_1.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|INTEGER|INTEGER|INTEGER|DECIMAL|BIGINT
+-- delimiter: |; types: VARCHAR|INTEGER|INTEGER|INTEGER|DECIMAL|BIGINT
 catalog|1001001|1|1|115019.61|20|
 catalog|1001001|1|2|146344.47|27|
 catalog|1001001|1|3|22597.19|3|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q14_2.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q14_2.result
index 10ce3c916323..6236a03acc43 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q14_2.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q14_2.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|INTEGER|INTEGER|INTEGER|DECIMAL|BIGINT|LONGNVARCHAR|INTEGER|INTEGER|INTEGER|DECIMAL|BIGINT
+-- delimiter: |; types: VARCHAR|INTEGER|INTEGER|INTEGER|DECIMAL|BIGINT|VARCHAR|INTEGER|INTEGER|INTEGER|DECIMAL|BIGINT
 store|1001001|1|1|372549.59|137|store|1001001|1|1|1316197.43|340|
 store|1001002|1|1|799646.86|229|store|1001002|1|1|775776.63|188|
 store|1002001|2|1|765555.91|202|store|1002001|2|1|1218310.82|337|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q17.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q17.result
index ef98952473ee..ea5f61d487bc 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q17.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q17.result
@@ -1,2 +1,2 @@
--- delimiter: |; types: CHAR|LONGNVARCHAR|CHAR|BIGINT|DOUBLE|DOUBLE|DOUBLE|BIGINT|DOUBLE|DOUBLE|DOUBLE|BIGINT|DOUBLE|DOUBLE|DOUBLE
+-- delimiter: |; types: CHAR|VARCHAR|CHAR|BIGINT|DOUBLE|DOUBLE|DOUBLE|BIGINT|DOUBLE|DOUBLE|DOUBLE|BIGINT|DOUBLE|DOUBLE|DOUBLE
 AAAAAAAAKPFEAAAA|Recently right|TN|1|99.00000000000|null|null|1|66.00000000000|null|null|1|32.00000000000|null|null|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q18.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q18.result
index 732b1ac941ff..2f27df2b02a7 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q18.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q18.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|LONGNVARCHAR|CHAR|LONGNVARCHAR|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL
+-- delimiter: |; types: CHAR|VARCHAR|CHAR|VARCHAR|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL
 AAAAAAAABFBAAAAA|United States|IN|Adams County|8|86.17|0|85.30|415.20|1981|2|
 AAAAAAAADMKDAAAA|United States|IN|Adams County|99|29.12|0|11.06|-562.32|1981|2|
 AAAAAAAAEGDAAAAA|United States|IN|Adams County|70|51.12|0|34.25|1110.20|1981|2|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q20.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q20.result
index 5b5ba0204ec8..6411cfec7afa 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q20.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q20.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|LONGNVARCHAR|CHAR|CHAR|DECIMAL|DECIMAL|DECIMAL
+-- delimiter: |; types: CHAR|VARCHAR|CHAR|CHAR|DECIMAL|DECIMAL|DECIMAL
 AAAAAAAAAAKAAAAA|Small, political activities help great, bad policies. Therefore square features provide on a machines. Rules make over me|Books                                             |arts                                              |2.42|6478.75|3.23|
 AAAAAAAAACKBAAAA|Clinical, inc initiatives make specially according to a activities.|Books                                             |arts                                              |6.92|1806.72|0.90|
 AAAAAAAAAIJCAAAA|Simply small grounds use exactly effects. Services could kill especially aware, large observers. Civil, relevant years ensure regulations; clear drawings realize actors. Products employ a|Books                                             |arts                                              |1.76|14302.11|7.13|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q21.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q21.result
index fcf14b903d53..230b8beca046 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q21.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q21.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|CHAR|BIGINT|BIGINT
+-- delimiter: |; types: VARCHAR|CHAR|BIGINT|BIGINT
 Bad cards must make.|AAAAAAAAAACDAAAA|1889|2168|
 Bad cards must make.|AAAAAAAAAAHDAAAA|2739|2039|
 Bad cards must make.|AAAAAAAAABDAAAAA|1717|1782|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q24_1.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q24_1.result
index d5704c16d9f5..7f0c937593ae 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q24_1.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q24_1.result
@@ -1,4 +1,4 @@
--- delimiter: |; ignoreOrder: true; types: CHAR|CHAR|LONGNVARCHAR|DECIMAL
+-- delimiter: |; ignoreOrder: true; types: CHAR|CHAR|VARCHAR|DECIMAL
 Holt                          |Curtis              |able|8225.80|
 null|Tommy               |able|38118.08|
 Pettit                        |Richard             |able|3930.52|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q24_2.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q24_2.result
index 92a80a8f9f11..2488334a59fd 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q24_2.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q24_2.result
@@ -1,2 +1,2 @@
--- delimiter: |; types: CHAR|CHAR|LONGNVARCHAR|DECIMAL
+-- delimiter: |; types: CHAR|CHAR|VARCHAR|DECIMAL
 Griffith                      |Ray                 |able|161564.48|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q25.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q25.result
index c84be72ac114..55fe2a3c1098 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q25.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q25.result
@@ -1,2 +1,2 @@
--- delimiter: |; types: CHAR|LONGNVARCHAR|CHAR|LONGNVARCHAR|DECIMAL|DECIMAL|DECIMAL
+-- delimiter: |; types: CHAR|VARCHAR|CHAR|VARCHAR|DECIMAL|DECIMAL|DECIMAL
 AAAAAAAADPMBAAAA|Things know alone letters. Flights should tend even jewish fees. Civil plans could not cry also social days; other losses might not pay walls; still able signs should not remove too human |AAAAAAAAHAAAAAAA|ation|12.84|91.41|-1329.46|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q29.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q29.result
index b64cee10b06f..67f1fb9a2281 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q29.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q29.result
@@ -1,2 +1,2 @@
--- delimiter: |; types: CHAR|LONGNVARCHAR|CHAR|LONGNVARCHAR|BIGINT|BIGINT|BIGINT
+-- delimiter: |; types: CHAR|VARCHAR|CHAR|VARCHAR|BIGINT|BIGINT|BIGINT
 AAAAAAAABOKDAAAA|Immediate women sell. Slowly sure measures might ensure in order from a duties. Privately aware damages may compensate so for example previous letters|AAAAAAAABAAAAAAA|ought|99|81|22|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q30.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q30.result
index db6eeb0e0fae..a75c9d6dbde3 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q30.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q30.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|CHAR|CHAR|CHAR|CHAR|INTEGER|INTEGER|INTEGER|LONGNVARCHAR|CHAR|CHAR|BIGINT|DECIMAL
+-- delimiter: |; types: CHAR|CHAR|CHAR|CHAR|CHAR|INTEGER|INTEGER|INTEGER|VARCHAR|CHAR|CHAR|BIGINT|DECIMAL
 AAAAAAAAAAAIBAAA|Mr.       |Eduardo             |Goodwin                       |Y|24|11|1950|GHANA|null|Eduardo.Goodwin@rolemn2xusv5Ot0.edu               |2452312|3838.00|
 AAAAAAAAABHAAAAA|Sir       |Robert              |Thornton                      |Y|24|5|1924|HONG KONG|null|Robert.Thornton@jas.edu                           |2452431|2434.58|
 AAAAAAAAABPNAAAA|Mr.       |Alonzo              |Huddleston                    |Y|19|4|1957|FAROE ISLANDS|null|Alonzo.Huddleston@g.edu                           |2452289|2813.00|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q31.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q31.result
index 436041b88a3d..71e3b425463c 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q31.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q31.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|INTEGER|DECIMAL|DECIMAL|DECIMAL|DECIMAL
+-- delimiter: |; types: VARCHAR|INTEGER|DECIMAL|DECIMAL|DECIMAL|DECIMAL
 Atchison County|2000|0.80|0.24|11.94|3.16|
 Bacon County|2000|1.17|0.39|0.97|0.51|
 Bourbon County|2000|1.91|0.98|3.36|1.38|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q37.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q37.result
index e6be961ba726..861f3dbb0a2c 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q37.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q37.result
@@ -1,2 +1,2 @@
--- delimiter: |; types: CHAR|LONGNVARCHAR|DECIMAL
+-- delimiter: |; types: CHAR|VARCHAR|DECIMAL
 AAAAAAAAHFMBAAAA|Jobs crack at all public countries. Possible, traditional initiatives will make british problems. Fiscal years call extremely just growing pupils. Soon dutch voices|86.11|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q43.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q43.result
index d52918383b85..6f2e39b91df0 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q43.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q43.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|CHAR|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL
+-- delimiter: |; types: VARCHAR|CHAR|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL
 able|AAAAAAAACAAAAAAA|517884.59|469230.50|505832.67|443696.30|479716.97|462447.50|503064.60|
 ation|AAAAAAAAHAAAAAAA|508811.68|474290.02|448808.84|492870.99|498127.64|474355.89|505906.68|
 bar|AAAAAAAAKAAAAAAA|496021.80|459933.01|479825.96|474630.24|482326.79|478330.87|505252.22|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q45.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q45.result
index 5d4c1c7b2c21..1b7cbfd97b36 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q45.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q45.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|LONGNVARCHAR|DECIMAL
+-- delimiter: |; types: CHAR|VARCHAR|DECIMAL
 10150     |Bunker Hill|20.25|
 16098     |Five Points|18.05|
 28048     |Salem|9.81|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q46.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q46.result
index 2ba33f1ffe23..97fffea1bb39 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q46.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q46.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|CHAR|LONGNVARCHAR|LONGNVARCHAR|BIGINT|DECIMAL|DECIMAL
+-- delimiter: |; types: CHAR|CHAR|VARCHAR|VARCHAR|BIGINT|DECIMAL|DECIMAL
 Aaron                         |Charles             |Jamestown|Red Hill|183217|2067.37|-8054.03|
 Aaron                         |Genevieve           |Lakeside|Springtown|185247|1739.84|-1337.44|
 Aaron                         |Guy                 |Lakeside|Mount Pleasant|210815|1849.59|-11333.00|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q47.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q47.result
index 5c990d000e91..f50d2222650b 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q47.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q47.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|CHAR|LONGNVARCHAR|LONGNVARCHAR|INTEGER|INTEGER|DECIMAL|DECIMAL|DECIMAL|DECIMAL
+-- delimiter: |; types: CHAR|CHAR|VARCHAR|VARCHAR|INTEGER|INTEGER|DECIMAL|DECIMAL|DECIMAL|DECIMAL
 Men                                               |importoimporto #1                                 |ese|Unknown|1999|3|5492.82|2070.65|3307.78|2784.11|
 Music                                             |exportischolar #1                                 |eing|Unknown|1999|2|5134.24|1740.21|4401.89|2721.61|
 Music                                             |edu packscholar #1                                |ese|Unknown|1999|4|5463.70|2091.07|3391.39|3095.31|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q49.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q49.result
index 870c02458a94..ba702edfa6e0 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q49.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q49.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|BIGINT|DECIMAL|BIGINT|BIGINT
+-- delimiter: |; types: VARCHAR|BIGINT|DECIMAL|BIGINT|BIGINT
 catalog|17543|0.5714|1|1|
 catalog|14513|0.6354|2|2|
 catalog|12577|0.6559|3|3|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q50.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q50.result
index 3a7454a9158e..830de2104d27 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q50.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q50.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|INTEGER|LONGNVARCHAR|LONGNVARCHAR|CHAR|CHAR|LONGNVARCHAR|LONGNVARCHAR|CHAR|CHAR|BIGINT|BIGINT|BIGINT|BIGINT|BIGINT
+-- delimiter: |; types: VARCHAR|INTEGER|VARCHAR|VARCHAR|CHAR|CHAR|VARCHAR|VARCHAR|CHAR|CHAR|BIGINT|BIGINT|BIGINT|BIGINT|BIGINT
 able|1|255|Sycamore |Dr.            |Suite 410 |Midway|Williamson County|TN|31904     |67|48|61|66|98|
 ation|1|811|Lee |Circle         |Suite T   |Midway|Williamson County|TN|31904     |70|51|50|61|109|
 bar|1|175|4th |Court          |Suite C   |Midway|Williamson County|TN|31904     |96|53|55|76|86|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q57.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q57.result
index 45f24bca2c39..fe8c80cb5874 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q57.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q57.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|CHAR|LONGNVARCHAR|INTEGER|INTEGER|DECIMAL|DECIMAL|DECIMAL|DECIMAL
+-- delimiter: |; types: CHAR|CHAR|VARCHAR|INTEGER|INTEGER|DECIMAL|DECIMAL|DECIMAL|DECIMAL
 Shoes                                             |importoedu pack #1                                |North Midwest|1999|3|7101.78|2518.33|5264.86|3066.29|
 Men                                               |edu packimporto #1                                |NY Metro|1999|4|7659.24|3227.88|4759.01|4664.83|
 Music                                             |amalgscholar #1                                   |Mid Atlantic|1999|1|6659.49|2291.60|14178.45|4267.08|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q59.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q59.result
index e80e8de60e1f..4c33e4d6e351 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q59.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q59.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|CHAR|INTEGER|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL
+-- delimiter: |; types: VARCHAR|CHAR|INTEGER|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL
 able|AAAAAAAACAAAAAAA|5271|1.36|3.09|0.32|0.48|1.14|0.76|1.85|
 able|AAAAAAAACAAAAAAA|5271|1.36|3.09|0.32|0.48|1.14|0.76|1.85|
 able|AAAAAAAACAAAAAAA|5271|1.36|3.09|0.32|0.48|1.14|0.76|1.85|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q62.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q62.result
index 93cf5f7744d4..c2aad2400afd 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q62.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q62.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|CHAR|LONGNVARCHAR|BIGINT|BIGINT|BIGINT|BIGINT|BIGINT
+-- delimiter: |; types: VARCHAR|CHAR|VARCHAR|BIGINT|BIGINT|BIGINT|BIGINT|BIGINT
 Bad cards must make.|EXPRESS                       |site_0|251|248|268|277|0|
 Bad cards must make.|EXPRESS                       |site_1|262|304|290|267|0|
 Bad cards must make.|EXPRESS                       |site_2|287|290|293|286|0|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q64.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q64.result
index dfb012f51881..4452f383d217 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q64.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q64.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|LONGNVARCHAR|CHAR|CHAR|LONGNVARCHAR|LONGNVARCHAR|CHAR|CHAR|LONGNVARCHAR|LONGNVARCHAR|CHAR|INTEGER|BIGINT|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|INTEGER|BIGINT
+-- delimiter: |; types: CHAR|VARCHAR|CHAR|CHAR|VARCHAR|VARCHAR|CHAR|CHAR|VARCHAR|VARCHAR|CHAR|INTEGER|BIGINT|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|INTEGER|BIGINT
 n stableableantiought                             |able|31904     |987       |Hillcrest |Fairbanks|46653     |216       |3rd |Reno|40344     |1999|1|55.42|80.91|954.53|59.08|76.80|0.00|2000|1|
 n stableableantiought                             |ation|31904     |425       |Green |Enterprise|11757     |772       |Valley |null|null|1999|1|16.24|25.17|0.00|7.92|11.80|0.00|2000|1|
 n stableableantiought                             |ation|31904     |425       |Green |Enterprise|11757     |772       |Valley |null|null|1999|1|16.24|25.17|0.00|44.27|58.43|0.00|2000|1|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q65.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q65.result
index b2c0c3615cb3..285f78eafb93 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q65.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q65.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|LONGNVARCHAR|DECIMAL|DECIMAL|DECIMAL|CHAR
+-- delimiter: |; types: VARCHAR|VARCHAR|DECIMAL|DECIMAL|DECIMAL|CHAR
 able|Commercial, popular processes give later now wooden facts. Black, outer purposes examine national, precise heels. Invisible times s|36.06|5.25|1.68|amalgedu pack #1                                  |
 able|Conventional, responsible products discuss delicately then actual findings. Extremel|36.42|3.67|2.82|namelessnameless #5                               |
 able|Difficulties wou|25.25|6.61|2.31|importobrand #7                                   |
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q66.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q66.result
index 3f3ae1890a4b..9f7a3cca23e0 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q66.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q66.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|INTEGER|LONGNVARCHAR|LONGNVARCHAR|CHAR|LONGNVARCHAR|LONGNVARCHAR|INTEGER|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL
+-- delimiter: |; types: VARCHAR|INTEGER|VARCHAR|VARCHAR|CHAR|VARCHAR|VARCHAR|INTEGER|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL|DECIMAL
 Bad cards must make.|621234|Fairview|Williamson County|TN|United States|DHL,BARIAN|2001|9506753.46|8008140.33|6116769.63|11973045.15|7756254.92|5352978.49|13733996.10|16418794.37|17212743.32|17042707.41|34304935.61|35324164.21|15.30|12.89|9.85|19.27|12.49|8.62|22.11|26.43|27.70|27.43|55.22|56.86|30534943.77|24481685.94|22178710.81|25695798.18|29954903.78|18084140.05|30805576.13|47156887.22|51158588.86|55759942.80|86253544.16|83451555.63|
 Conventional childr|977787|Fairview|Williamson County|TN|United States|DHL,BARIAN|2001|8860645.55|14415813.74|6761497.23|11820654.76|8246260.69|6636877.49|11434492.25|25673812.14|23074206.96|21834581.94|26894900.53|33575091.74|9.06|14.75|6.92|12.09|8.43|6.78|11.69|26.25|23.60|22.34|27.51|34.34|23836085.83|32073313.37|25037904.18|22659895.86|21757401.03|24451608.10|21933001.85|55996703.43|57371880.44|62087214.51|82849910.15|88970319.31|
 Doors canno|294242|Fairview|Williamson County|TN|United States|DHL,BARIAN|2001|6355232.31|10198920.36|10246200.97|12209716.50|8566998.28|8806316.81|9789405.60|16466584.88|26443785.61|27016047.80|33660589.67|27462468.62|21.60|34.66|34.82|41.49|29.12|29.93|33.27|55.96|89.87|91.81|114.40|93.34|22645143.09|24487254.60|24925759.42|30503655.27|26558160.29|20976233.52|29895796.09|56002198.38|53488158.53|76287235.46|82483747.59|88088266.69|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q68.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q68.result
index 74ea55868d96..da138a507d70 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q68.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q68.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|CHAR|LONGNVARCHAR|LONGNVARCHAR|BIGINT|DECIMAL|DECIMAL|DECIMAL
+-- delimiter: |; types: CHAR|CHAR|VARCHAR|VARCHAR|BIGINT|DECIMAL|DECIMAL|DECIMAL
 Aaron                         |Guy                 |Lakeside|Mount Pleasant|210815|24704.66|678.88|45673.18|
 Abbott                        |Joseph              |Greenfield|Midway|62751|37795.50|1086.40|53385.17|
 Abbott                        |Harriet             |Wesley|Forest Hills|84405|23666.36|1274.86|45689.64|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q70.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q70.result
index 344be9566007..2aff45526869 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q70.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q70.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: DECIMAL|CHAR|LONGNVARCHAR|INTEGER|BIGINT
+-- delimiter: |; types: DECIMAL|CHAR|VARCHAR|INTEGER|BIGINT
 -440986113.22|null|null|2|1|
 -440986113.22|TN|null|1|1|
 -440986113.22|TN|Williamson County|0|1|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q72.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q72.result
index 7227c5ee2f72..325b10702f7b 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q72.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q72.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|LONGNVARCHAR|INTEGER|BIGINT|BIGINT|BIGINT
+-- delimiter: |; types: VARCHAR|VARCHAR|INTEGER|BIGINT|BIGINT|BIGINT
 Best possible ages tell together new, st|Conventional childr|5213|0|2|2|
 Closed, good condition|Doors canno|5169|0|2|2|
 Departments make once again police. Very acceptable results call still extended, known ends; relationships shoot strangely. Acids shall discharge in order ethnic, ric|null|5168|0|2|2|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q76.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q76.result
index f1b514ed3cab..c54421d4fed8 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q76.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q76.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|LONGNVARCHAR|INTEGER|INTEGER|CHAR|BIGINT|DECIMAL
+-- delimiter: |; types: VARCHAR|VARCHAR|INTEGER|INTEGER|CHAR|BIGINT|DECIMAL
 catalog|cs_ship_addr_sk|1998|1|Books                                             |14|24660.12|
 catalog|cs_ship_addr_sk|1998|1|Children                                          |5|5064.75|
 catalog|cs_ship_addr_sk|1998|1|Electronics                                       |13|31709.80|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q77.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q77.result
index ae296c5c467b..74635c53c8a5 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q77.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q77.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|BIGINT|DECIMAL|DECIMAL|DECIMAL
+-- delimiter: |; types: VARCHAR|BIGINT|DECIMAL|DECIMAL|DECIMAL
 catalog channel|1|132885061.65|2050279.74|-12674076.58|
 catalog channel|2|140503047.65|2050279.74|-14906564.08|
 catalog channel|5|130483795.90|2050279.74|-13798294.43|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q79.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q79.result
index 2739f57bfa00..174c3a0d5d67 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q79.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q79.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|CHAR|LONGNVARCHAR|BIGINT|DECIMAL|DECIMAL
+-- delimiter: |; types: CHAR|CHAR|VARCHAR|BIGINT|DECIMAL|DECIMAL
 Aaron                         |Guy                 |Midway|30633|8423.48|-7612.67|
 Abbott                        |James               |Midway|19069|11829.58|-14596.44|
 Abbott                        |Robert              |Midway|108183|2094.22|-11543.20|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q80.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q80.result
index 26eddaefa715..ecfad56937c6 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q80.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q80.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|LONGNVARCHAR|DECIMAL|DECIMAL|DECIMAL
+-- delimiter: |; types: VARCHAR|VARCHAR|DECIMAL|DECIMAL|DECIMAL
 catalog channel|catalog_pageAAAAAAAAAAABAAAA|19965.69|3132.48|-16011.54
 catalog channel|catalog_pageAAAAAAAAABABAAAA|14376.88|380.9|-3715.45
 catalog channel|catalog_pageAAAAAAAAACABAAAA|4427.58|0|-6520.01
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q81.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q81.result
index fc1d4179e347..d665451699b0 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q81.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q81.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|CHAR|CHAR|CHAR|CHAR|LONGNVARCHAR|CHAR|CHAR|LONGNVARCHAR|LONGNVARCHAR|CHAR|CHAR|LONGNVARCHAR|DECIMAL|CHAR|DECIMAL
+-- delimiter: |; types: CHAR|CHAR|CHAR|CHAR|CHAR|VARCHAR|CHAR|CHAR|VARCHAR|VARCHAR|CHAR|CHAR|VARCHAR|DECIMAL|CHAR|DECIMAL
 AAAAAAAAABBEAAAA|Dr.       |Oscar               |Fox                           |183       |15th |Ln             |Suite P   |Greenwood|Clay County|GA|38828     |United States|-5.00|condo               |4607.92|
 AAAAAAAAADCEBAAA|Sir       |Billy               |Bell                          |690       |4th Fifth|Ct.            |Suite 390 |Hillcrest|Spalding County|GA|33003     |United States|-5.00|condo               |5567.44|
 AAAAAAAAAFBGAAAA|Mrs.      |Erika               |Buford                        |527       |1st |Ln             |Suite 380 |Lakewood|Jasper County|GA|38877     |United States|-5.00|single family       |5412.16|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q82.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q82.result
index 4f8e45f8416f..3a67a4e5e125 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q82.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q82.result
@@ -1,3 +1,3 @@
--- delimiter: |; types: CHAR|LONGNVARCHAR|DECIMAL
+-- delimiter: |; types: CHAR|VARCHAR|DECIMAL
 AAAAAAAAECMCAAAA|Rather vast companies pose quiet, actual carers. Close times take only simple possibilities. Current events might say only on a foundation|67.28|
 AAAAAAAALIHCAAAA|Things select increased views. Tools imagine for example; ever likely developments live so scottish benefits. Soft, short-term services should give indeed good illu|86.90|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q84.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q84.result
index 6bce13aacbee..bc07b789d666 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q84.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q84.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|LONGNVARCHAR
+-- delimiter: |; types: CHAR|VARCHAR
 AAAAAAAAAIPGAAAA|Carter                        , Rodney              |
 AAAAAAAAAKMBBAAA|Mcarthur                      , Emma                |
 AAAAAAAACBNHBAAA|Wells                         , Ron                 |
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q89.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q89.result
index 707bcafca216..e48c52d0df4e 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q89.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q89.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|CHAR|CHAR|LONGNVARCHAR|LONGNVARCHAR|INTEGER|DECIMAL|DECIMAL
+-- delimiter: |; types: CHAR|CHAR|CHAR|VARCHAR|VARCHAR|INTEGER|DECIMAL|DECIMAL
 Men                                               |shirts                                            |importoimporto #1                                 |ese|Unknown|3|2070.65|5492.82|
 Men                                               |shirts                                            |importoimporto #1                                 |ought|Unknown|6|2152.15|5045.76|
 Men                                               |shirts                                            |importoimporto #1                                 |able|Unknown|2|2333.43|5194.82|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q91.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q91.result
index 15fb11fc2695..393f16334dd1 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q91.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q91.result
@@ -1,2 +1,2 @@
--- delimiter: |; types: CHAR|LONGNVARCHAR|LONGNVARCHAR|DECIMAL
+-- delimiter: |; types: CHAR|VARCHAR|VARCHAR|DECIMAL
 AAAAAAAACAAAAAAA|Mid Atlantic|Felipe Perkins|109.74|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q98.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q98.result
index 44b3aa9bd66c..59db92f8b62c 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q98.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q98.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: CHAR|LONGNVARCHAR|CHAR|CHAR|DECIMAL|DECIMAL|DECIMAL
+-- delimiter: |; types: CHAR|VARCHAR|CHAR|CHAR|DECIMAL|DECIMAL|DECIMAL
 AAAAAAAAAAKAAAAA|Small, political activities help great, bad policies. Therefore square features provide on a machines. Rules make over me|Books                                             |arts                                              |2.42|9866.76|3.17|
 AAAAAAAAACKBAAAA|Clinical, inc initiatives make specially according to a activities.|Books                                             |arts                                              |6.92|9562.33|3.07|
 AAAAAAAAAIJCAAAA|Simply small grounds use exactly effects. Services could kill especially aware, large observers. Civil, relevant years ensure regulations; clear drawings realize actors. Products employ a|Books                                             |arts                                              |1.76|7565.38|2.43|
diff --git a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q99.result b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q99.result
index 5a8e4c060750..dacf10bb3f4d 100644
--- a/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q99.result
+++ b/presto-product-tests/src/main/resources/sql-tests/testcases/tpcds/q99.result
@@ -1,4 +1,4 @@
--- delimiter: |; types: LONGNVARCHAR|CHAR|LONGNVARCHAR|BIGINT|BIGINT|BIGINT|BIGINT|BIGINT
+-- delimiter: |; types: VARCHAR|CHAR|VARCHAR|BIGINT|BIGINT|BIGINT|BIGINT|BIGINT
 Bad cards must make.|EXPRESS                       |Mid Atlantic|1270|1318|1281|0|0|
 Bad cards must make.|EXPRESS                       |NY Metro|1226|1287|1282|0|0|
 Bad cards must make.|EXPRESS                       |North Midwest|1208|1242|1294|0|0|