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 72e99a9489224..38cdd19abd7be 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
@@ -51,7 +51,7 @@
 import static java.sql.JDBCType.INTEGER;
 import static java.sql.JDBCType.LONGNVARCHAR;
 import static java.sql.JDBCType.SMALLINT;
-import static java.sql.JDBCType.VARBINARY;
+import static java.sql.JDBCType.VARCHAR;
 
 public class TestHiveCoercion
         extends ProductTest
@@ -291,7 +291,7 @@ else if (usingTeradataJdbcDriver(connection)) {
                     INTEGER,
                     BIGINT,
                     BIGINT,
-                    VARBINARY,
+                    VARCHAR,
                     INTEGER,
                     DOUBLE,
                     BIGINT
diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/jdbc/PreparedStatements.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/jdbc/PreparedStatements.java
index 80fc44b35be03..d55a9c34709cb 100644
--- a/presto-product-tests/src/main/java/com/facebook/presto/tests/jdbc/PreparedStatements.java
+++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/jdbc/PreparedStatements.java
@@ -164,13 +164,13 @@ public void preparedInsertApi()
                     param(BIGINT, new BigInteger("9223372036854775807")),
                     param(FLOAT, Float.valueOf("123.345")),
                     param(DOUBLE, 234.567),
-                    param(DECIMAL, BigDecimal.valueOf(345.678)),
+                    param(DECIMAL, BigDecimal.valueOf(345)),
                     param(DECIMAL, BigDecimal.valueOf(345.678)),
                     param(TIMESTAMP, Timestamp.valueOf("2015-05-10 12:15:35")),
                     param(DATE, Date.valueOf("2015-05-10")),
                     param(VARCHAR, "ala ma kota"),
                     param(VARCHAR, "ala ma kot"),
-                    param(CHAR, "ala ma"),
+                    param(CHAR, "    ala ma"),
                     param(BOOLEAN, Boolean.TRUE),
                     param(VARBINARY, "a290IGJpbmFybnk=".getBytes()));
 
@@ -187,7 +187,7 @@ public void preparedInsertApi()
                     param(DATE, Date.valueOf("2014-03-10")),
                     param(VARCHAR, "abc"),
                     param(VARCHAR, "def"),
-                    param(CHAR, "ghi"),
+                    param(CHAR, "       ghi"),
                     param(BOOLEAN, Boolean.FALSE),
                     param(VARBINARY, "jkl".getBytes()));
 
@@ -215,16 +215,16 @@ public void preparedInsertApi()
                             127,
                             32767,
                             2147483647,
-                            new BigInteger("9223372036854775807"),
+                            new Long("9223372036854775807"),
                             Float.valueOf("123.345"),
                             234.567,
-                            BigDecimal.valueOf(345.678),
-                            BigDecimal.valueOf(345.678),
+                            BigDecimal.valueOf(345),
+                            new BigDecimal("345.67800"),
                             Timestamp.valueOf("2015-05-10 12:15:35"),
                             Date.valueOf("2015-05-10"),
                             "ala ma kota",
-                            "ala ma kota",
-                            "ala ma",
+                            "ala ma kot",
+                            "    ala ma",
                             Boolean.TRUE,
                             "a290IGJpbmFybnk=".getBytes()),
                     row(
@@ -234,13 +234,13 @@ public void preparedInsertApi()
                             4,
                             Float.valueOf("5.6"),
                             7.8,
-                            BigDecimal.valueOf(9.1),
+                            BigDecimal.valueOf(91),
                             BigDecimal.valueOf(2.3),
                             Timestamp.valueOf("2012-05-10 1:35:15"),
                             Date.valueOf("2014-03-10"),
                             "abc",
                             "def",
-                            "ghi",
+                            "       ghi",
                             Boolean.FALSE,
                             "jkl".getBytes()),
                     row(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null));
@@ -268,9 +268,9 @@ public void preparedInsertSql()
                     "cast(32767 as smallint), " +
                     "2147483647, " +
                     "9223372036854775807, " +
-                    "cast(123.345 as float), " +
+                    "cast(123.345 as real), " +
                     "cast(234.567 as double), " +
-                    "cast(345.678 as decimal(10)), " +
+                    "cast(345 as decimal(10)), " +
                     "cast(345.678 as decimal(10,5)), " +
                     "timestamp '2015-05-10 12:15:35', " +
                     "date '2015-05-10', " +
@@ -285,16 +285,16 @@ public void preparedInsertSql()
                     "cast(2 as smallint), " +
                     "3, " +
                     "4, " +
-                    "cast(5.6 as float), " +
+                    "cast(5.6 as real), " +
                     "cast(7.8 as double), " +
-                    "cast(9.1 as decimal(10)), " +
+                    "cast(9 as decimal(10)), " +
                     "cast(2.3 as decimal(10,5)), " +
                     "timestamp '2012-05-10 1:35:15', " +
                     "date '2014-03-10', " +
                     "'abc', " +
                     "'def', " +
                     "cast('ghi' as char(10)), " +
-                    "true, " +
+                    "false, " +
                     "varbinary 'jkl'");
 
             statement.execute(executeSql +
@@ -321,16 +321,16 @@ public void preparedInsertSql()
                             127,
                             32767,
                             2147483647,
-                            new BigInteger("9223372036854775807"),
+                            new Long("9223372036854775807"),
                             Float.valueOf("123.345"),
                             234.567,
-                            BigDecimal.valueOf(345.678),
-                            BigDecimal.valueOf(345.678),
+                            BigDecimal.valueOf(345),
+                            new BigDecimal("345.67800"),
                             Timestamp.valueOf("2015-05-10 12:15:35"),
                             Date.valueOf("2015-05-10"),
                             "ala ma kota",
-                            "ala ma kota",
-                            "ala ma",
+                            "ala ma kot",
+                            "ala ma    ",
                             Boolean.TRUE,
                             "a290IGJpbmFybnk=".getBytes()),
                     row(
@@ -340,13 +340,13 @@ public void preparedInsertSql()
                             4,
                             Float.valueOf("5.6"),
                             7.8,
-                            BigDecimal.valueOf(9.1),
-                            BigDecimal.valueOf(2.3),
+                            BigDecimal.valueOf(9),
+                            new BigDecimal("2.30000"),
                             Timestamp.valueOf("2012-05-10 1:35:15"),
                             Date.valueOf("2014-03-10"),
                             "abc",
                             "def",
-                            "ghi",
+                            "ghi       ",
                             Boolean.FALSE,
                             "jkl".getBytes()),
                     row(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null));
diff --git a/presto-product-tests/src/main/resources/com/facebook/presto/tests/jdbc/get_nation_columns_simba.result b/presto-product-tests/src/main/resources/com/facebook/presto/tests/jdbc/get_nation_columns_simba.result
index dbcce5dc09822..ef083c0097975 100644
--- a/presto-product-tests/src/main/resources/com/facebook/presto/tests/jdbc/get_nation_columns_simba.result
+++ b/presto-product-tests/src/main/resources/com/facebook/presto/tests/jdbc/get_nation_columns_simba.result
@@ -1,5 +1,5 @@
 -- delimiter: |; ignoreOrder: false; ignoreExcessRows: false;
 hive|default|nation|n_nationkey|-5|bigint|19|8|0|10|1|null|null|null|null|null|1|YES|null|null|null|null|null|null|
-hive|default|nation|n_name|12|varchar|2048|2048|null|10|1|null|null|null|null|2048|2|YES|null|null|null|null|null|null|
+hive|default|nation|n_name|12|varchar(25)|25|25|null|10|1|null|null|null|null|2048|2|YES|null|null|null|null|null|null|
 hive|default|nation|n_regionkey|-5|bigint|19|8|0|10|1|null|null|null|null|null|3|YES|null|null|null|null|null|null|
-hive|default|nation|n_comment|12|varchar|2048|2048|null|10|1|null|null|null|null|2048|4|YES|null|null|null|null|null|null|
+hive|default|nation|n_comment|12|varchar(152)|152|152|null|10|1|null|null|null|null|2048|4|YES|null|null|null|null|null|null|
diff --git a/presto-product-tests/src/main/resources/com/facebook/presto/tests/jdbc/get_nation_columns_simba4.result b/presto-product-tests/src/main/resources/com/facebook/presto/tests/jdbc/get_nation_columns_simba4.result
index 58eb7d3ac3008..bc3ccf5aa5e27 100644
--- a/presto-product-tests/src/main/resources/com/facebook/presto/tests/jdbc/get_nation_columns_simba4.result
+++ b/presto-product-tests/src/main/resources/com/facebook/presto/tests/jdbc/get_nation_columns_simba4.result
@@ -1,5 +1,5 @@
 -- delimiter: |; ignoreOrder: false; ignoreExcessRows: false;
 hive|default|nation|n_nationkey|-5|bigint|19|8|0|10|1|null|null|null|null|null|1|YES|null|null|null|null|null|
-hive|default|nation|n_name|12|varchar|2048|2048|null|10|1|null|null|null|null|2048|2|YES|null|null|null|null|null|
+hive|default|nation|n_name|12|varchar(25)|25|25|null|10|1|null|null|null|null|2048|2|YES|null|null|null|null|null|
 hive|default|nation|n_regionkey|-5|bigint|19|8|0|10|1|null|null|null|null|null|3|YES|null|null|null|null|null|
-hive|default|nation|n_comment|12|varchar|2048|2048|null|10|1|null|null|null|null|2048|4|YES|null|null|null|null|null|
+hive|default|nation|n_comment|12|varchar(152)|152|152|null|10|1|null|null|null|null|2048|4|YES|null|null|null|null|null|